agent/src/share/classes/sun/jvm/hotspot/code/NMethod.java

*** 40,50 ****
    /** != InvocationEntryBci if this nmethod is an on-stack replacement method */
    private static CIntegerField entryBCIField;
    /** To support simple linked-list chaining of nmethods */
    private static AddressField  osrLinkField;
    private static AddressField  scavengeRootLinkField;
!   private static CIntegerField scavengeRootStateField;
  
    /** Offsets for different nmethod parts */
    private static CIntegerField exceptionOffsetField;
    private static CIntegerField deoptOffsetField;
    private static CIntegerField origPCOffsetField;
--- 40,50 ----
    /** != InvocationEntryBci if this nmethod is an on-stack replacement method */
    private static CIntegerField entryBCIField;
    /** To support simple linked-list chaining of nmethods */
    private static AddressField  osrLinkField;
    private static AddressField  scavengeRootLinkField;
!   private static JByteField    scavengeRootStateField;
  
    /** Offsets for different nmethod parts */
    private static CIntegerField exceptionOffsetField;
    private static CIntegerField deoptOffsetField;
    private static CIntegerField origPCOffsetField;
*** 90,100 ****
      zombieInstructionSizeField  = type.getCIntegerField("_zombie_instruction_size");
      methodField                 = type.getOopField("_method");
      entryBCIField               = type.getCIntegerField("_entry_bci");
      osrLinkField                = type.getAddressField("_osr_link");
      scavengeRootLinkField       = type.getAddressField("_scavenge_root_link");
!     scavengeRootStateField      = type.getCIntegerField("_scavenge_root_state");
  
      exceptionOffsetField        = type.getCIntegerField("_exception_offset");
      deoptOffsetField            = type.getCIntegerField("_deoptimize_offset");
      origPCOffsetField           = type.getCIntegerField("_orig_pc_offset");
      stubOffsetField             = type.getCIntegerField("_stub_offset");
--- 90,100 ----
      zombieInstructionSizeField  = type.getCIntegerField("_zombie_instruction_size");
      methodField                 = type.getOopField("_method");
      entryBCIField               = type.getCIntegerField("_entry_bci");
      osrLinkField                = type.getAddressField("_osr_link");
      scavengeRootLinkField       = type.getAddressField("_scavenge_root_link");
!     scavengeRootStateField      = type.getJByteField("_scavenge_root_state");
  
      exceptionOffsetField        = type.getCIntegerField("_exception_offset");
      deoptOffsetField            = type.getCIntegerField("_deoptimize_offset");
      origPCOffsetField           = type.getCIntegerField("_orig_pc_offset");
      stubOffsetField             = type.getCIntegerField("_stub_offset");
*** 272,282 ****
    public ScopeDesc getScopeDescAt(Address pc) {
      PCDesc pd = getPCDescAt(pc);
      if (Assert.ASSERTS_ENABLED) {
        Assert.that(pd != null, "scope must be present");
      }
!     return new ScopeDesc(this, pd.getScopeDecodeOffset(), pd.getReexecute());
    }
  
    /** This is only for use by the debugging system, and is only
        intended for use in the topmost frame, where we are not
        guaranteed to be at a PC for which we have a PCDesc. It finds
--- 272,282 ----
    public ScopeDesc getScopeDescAt(Address pc) {
      PCDesc pd = getPCDescAt(pc);
      if (Assert.ASSERTS_ENABLED) {
        Assert.that(pd != null, "scope must be present");
      }
!     return new ScopeDesc(this, pd.getScopeDecodeOffset(), pd.getObjDecodeOffset(), pd.getReexecute());
    }
  
    /** This is only for use by the debugging system, and is only
        intended for use in the topmost frame, where we are not
        guaranteed to be at a PC for which we have a PCDesc. It finds
*** 304,318 ****
        return NULL for compiled methods which don't have any
        ScopeDescs! */
    public ScopeDesc getScopeDescNearDbg(Address pc) {
      PCDesc pd = getPCDescNearDbg(pc);
      if (pd == null) return null;
!     return new ScopeDesc(this, pd.getScopeDecodeOffset(), pd.getReexecute());
    }
  
!   public Map/*<Address, PcDesc>*/ getSafepoints() {
!     Map safepoints = new HashMap(); // Map<Address, PcDesc>
      sun.jvm.hotspot.debugger.Address p = null;
      for (p = scopesPCsBegin(); p.lessThan(scopesPCsEnd());
           p = p.addOffsetTo(pcDescSize)) {
         PCDesc pcDesc = new PCDesc(p);
         sun.jvm.hotspot.debugger.Address pc = pcDesc.getRealPC(this);
--- 304,318 ----
        return NULL for compiled methods which don't have any
        ScopeDescs! */
    public ScopeDesc getScopeDescNearDbg(Address pc) {
      PCDesc pd = getPCDescNearDbg(pc);
      if (pd == null) return null;
!     return new ScopeDesc(this, pd.getScopeDecodeOffset(), pd.getObjDecodeOffset(), pd.getReexecute());
    }
  
!   public Map/*<Address, PCDesc>*/ getSafepoints() {
!     Map safepoints = new HashMap(); // Map<Address, PCDesc>
      sun.jvm.hotspot.debugger.Address p = null;
      for (p = scopesPCsBegin(); p.lessThan(scopesPCsEnd());
           p = p.addOffsetTo(pcDescSize)) {
         PCDesc pcDesc = new PCDesc(p);
         sun.jvm.hotspot.debugger.Address pc = pcDesc.getRealPC(this);