src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp

@@ -1141,16 +1141,16 @@
  
    // Jump to the compiled code just as if compiled code was doing it.
    __ bctr();
  }
  
- AdapterHandlerEntry* SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm,
-                                                             int total_args_passed,
-                                                             int comp_args_on_stack,
-                                                             const BasicType *sig_bt,
-                                                             const VMRegPair *regs,
-                                                             AdapterFingerPrint* fingerprint) {
+ void SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm,
+                                             int total_args_passed,
+                                             int comp_args_on_stack,
+                                             const BasicType *sig_bt,
+                                             const VMRegPair *regs,
+                                             AdapterHandlerEntry* handler) {
    address i2c_entry;
    address c2i_unverified_entry;
    address c2i_entry;
  
  

@@ -1221,12 +1221,12 @@
    BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
    bs->c2i_entry_barrier(masm, /* tmp register*/ ic_klass, /* tmp register*/ receiver_klass, /* tmp register*/ code);
  
    gen_c2i_adapter(masm, total_args_passed, comp_args_on_stack, sig_bt, regs, call_interpreter, ientry);
  
-   return AdapterHandlerLibrary::new_entry(fingerprint, i2c_entry, c2i_entry, c2i_unverified_entry,
-                                           c2i_no_clinit_check_entry);
+   handler->set_entry_points(i2c_entry, c2i_entry, c2i_unverified_entry, c2i_no_clinit_check_entry);
+   return;
  }
  
  // An oop arg. Must pass a handle not the oop itself.
  static void object_move(MacroAssembler* masm,
                          int frame_size_in_slots,