src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp

@@ -594,16 +594,17 @@
  
    __ jr(t1);
  }
  
  // ---------------------------------------------------------------
- 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 = __ pc();
    gen_i2c_adapter(masm, total_args_passed, comp_args_on_stack, sig_bt, regs);
  
    address c2i_unverified_entry = __ pc();
    Label skip_fixup;

@@ -656,11 +657,12 @@
    BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
    bs->c2i_entry_barrier(masm);
  
    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;
  }
  
  int SharedRuntime::vector_calling_convention(VMRegPair *regs,
                                               uint num_bits,
                                               uint total_args_passed) {