src/hotspot/share/jvmci/jvmciCodeInstaller.cpp

*** 1179,11 ***
      monitors_token = _debug_recorder->create_monitor_values(monitors);
  
      throw_exception = jvmci_env()->get_BytecodeFrame_rethrowException(frame) == JNI_TRUE;
    }
  
!   _debug_recorder->describe_scope(pc_offset, method, NULL, bci, reexecute, throw_exception, false, return_oop,
                                    locals_token, expressions_token, monitors_token);
  }
  
  void CodeInstaller::site_Safepoint(CodeBuffer& buffer, jint pc_offset, JVMCIObject site, JVMCI_TRAPS) {
    JVMCIObject debug_info = jvmci_env()->get_site_Infopoint_debugInfo(site);
--- 1179,11 ---
      monitors_token = _debug_recorder->create_monitor_values(monitors);
  
      throw_exception = jvmci_env()->get_BytecodeFrame_rethrowException(frame) == JNI_TRUE;
    }
  
!   _debug_recorder->describe_scope(pc_offset, method, NULL, bci, reexecute, throw_exception, false, return_oop, false,
                                    locals_token, expressions_token, monitors_token);
  }
  
  void CodeInstaller::site_Safepoint(CodeBuffer& buffer, jint pc_offset, JVMCIObject site, JVMCI_TRAPS) {
    JVMCIObject debug_info = jvmci_env()->get_site_Infopoint_debugInfo(site);

*** 1335,10 ***
--- 1335,12 ---
        case UNVERIFIED_ENTRY:
          _offsets.set_value(CodeOffsets::Entry, pc_offset);
          break;
        case VERIFIED_ENTRY:
          _offsets.set_value(CodeOffsets::Verified_Entry, pc_offset);
+         _offsets.set_value(CodeOffsets::Verified_Inline_Entry, pc_offset);
+         _offsets.set_value(CodeOffsets::Verified_Inline_Entry_RO, pc_offset);
          break;
        case OSR_ENTRY:
          _offsets.set_value(CodeOffsets::OSR_Entry, pc_offset);
          break;
        case EXCEPTION_HANDLER_ENTRY: