*** old/src/share/vm/code/nmethod.cpp	Wed Aug 19 10:35:01 2009
--- new/src/share/vm/code/nmethod.cpp	Wed Aug 19 10:35:01 2009

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
!  * Copyright 1997-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.

*** 964,974 ****
--- 964,974 ----
  
  ScopeDesc* nmethod::scope_desc_at(address pc) {
    PcDesc* pd = pc_desc_at(pc);
    guarantee(pd != NULL, "scope must be present");
    return new ScopeDesc(this, pd->scope_decode_offset(),
!                        pd->obj_decode_offset(), pd->should_reexecute());
  }
  
  
  void nmethod::clear_inline_caches() {
    assert(SafepointSynchronize::is_at_safepoint(), "cleaning of IC's only allowed at safepoint");

*** 1930,1940 ****
--- 1930,1940 ----
      ic = CompiledIC_at(call_site);
    }
    PcDesc* pd = pc_desc_at(ic->end_of_call());
    assert(pd != NULL, "PcDesc must exist");
    for (ScopeDesc* sd = new ScopeDesc(this, pd->scope_decode_offset(),
!                                      pd->obj_decode_offset(), pd->should_reexecute());
         !sd->is_top(); sd = sd->sender()) {
      sd->verify();
    }
  }
  

*** 2179,2189 ****
--- 2179,2189 ----
  // Return a the last scope in (begin..end]
  ScopeDesc* nmethod::scope_desc_in(address begin, address end) {
    PcDesc* p = pc_desc_near(begin+1);
    if (p != NULL && p->real_pc(this) <= end) {
      return new ScopeDesc(this, p->scope_decode_offset(),
!                          p->obj_decode_offset(), p->should_reexecute());
    }
    return NULL;
  }
  
  void nmethod::print_code_comment_on(outputStream* st, int column, u_char* begin, u_char* end) {