src/share/vm/code/nmethod.cpp

*** 986,996 ****
  
  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");
--- 986,997 ----
  
  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(),
!                        pd->return_oop());
  }
  
  
  void nmethod::clear_inline_caches() {
    assert(SafepointSynchronize::is_at_safepoint(), "cleaning of IC's only allowed at safepoint");
*** 2157,2167 ****
      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();
    }
  }
  
--- 2158,2169 ----
      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(),
!                                      pd->return_oop());
         !sd->is_top(); sd = sd->sender()) {
      sd->verify();
    }
  }
  
*** 2422,2432 ****
  // 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_nmethod_labels(outputStream* stream, address block_begin) {
--- 2424,2435 ----
  // 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(),
!                          p->return_oop());
    }
    return NULL;
  }
  
  void nmethod::print_nmethod_labels(outputStream* stream, address block_begin) {