src/hotspot/cpu/s390/sharedRuntime_s390.cpp

@@ -2350,16 +2350,16 @@
    __ z_stg(Z_method, thread_(callee_target));
  
    __ z_br(Z_R1_scratch);
  }
  
- 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) {
    __ align(CodeEntryAlignment);
    address i2c_entry = __ pc();
    gen_i2c_adapter(masm, total_args_passed, comp_args_on_stack, sig_bt, regs);
  
    address c2i_unverified_entry;

@@ -2409,11 +2409,12 @@
      c2i_no_clinit_check_entry = __ pc();
    }
  
    gen_c2i_adapter(masm, total_args_passed, comp_args_on_stack, sig_bt, regs, skip_fixup);
  
-   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;
  }
  
  // This function returns the adjust size (in number of words) to a c2i adapter
  // activation for use during deoptimization.
  //