src/hotspot/share/jvmci/jvmciCodeInstaller.cpp

@@ -1180,14 +1180,15 @@
          stack_token = _debug_recorder->create_scope_values(stack);
          monitors_token = _debug_recorder->create_monitor_values(monitors);
        }
  
        // has_ea_local_in_scope and arg_escape should be added to JVMCI
+       const bool return_scalarized     = false;
        const bool has_ea_local_in_scope = false;
        const bool arg_escape            = false;
        _debug_recorder->describe_scope(pc_offset, method, nullptr, bci, reexecute, rethrow_exception, is_mh_invoke, return_oop,
-                                       has_ea_local_in_scope, arg_escape,
+                                       return_scalarized, has_ea_local_in_scope, arg_escape,
                                        locals_token, stack_token, monitors_token);
      }
    }
    if (full_info) {
      // Clear the virtual objects as they are specific to one DebugInfo

@@ -1327,10 +1328,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: