src/hotspot/cpu/arm/sharedRuntime_arm.cpp

*** 610,16 ***
  
    __ ldr(PC, Address(Rmethod, Method::interpreter_entry_offset()));
  
  }
  
! 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) {
    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;
--- 610,16 ---
  
    __ ldr(PC, Address(Rmethod, Method::interpreter_entry_offset()));
  
  }
  
! 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;

*** 635,11 ***
    __ jump(SharedRuntime::get_ic_miss_stub(), relocInfo::runtime_call_type, noreg, ne);
  
    address c2i_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);
  }
  
  
  static int reg2offset_in(VMReg r) {
    // Account for saved FP and LR
--- 635,12 ---
    __ jump(SharedRuntime::get_ic_miss_stub(), relocInfo::runtime_call_type, noreg, ne);
  
    address c2i_entry = __ pc();
    gen_c2i_adapter(masm, total_args_passed, comp_args_on_stack, sig_bt, regs, skip_fixup);
  
!   handler->set_entry_points(i2c_entry, c2i_entry, c2i_unverified_entry, nullptr);
+   return;
  }
  
  
  static int reg2offset_in(VMReg r) {
    // Account for saved FP and LR