*** old/agent/src/share/classes/sun/jvm/hotspot/code/NMethod.java	Wed Aug 19 10:34:55 2009
--- new/agent/src/share/classes/sun/jvm/hotspot/code/NMethod.java	Wed Aug 19 10:34:55 2009

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
!  * Copyright 2000-2009 Sun Microsystems, Inc.  All Rights Reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 257,267 ****
--- 257,267 ----
    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

*** 289,299 ****
--- 289,299 ----
        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;