src/share/vm/code/nmethod.cpp

*** 2157,2167 ****
  
    PcDesc* pd = pc_desc_at(nativeCall_at(call_site)->return_address());
    assert(pd != NULL, "PcDesc must exist");
    for (ScopeDesc* sd = new ScopeDesc(this, pd->scope_decode_offset(),
                                       pd->obj_decode_offset(), pd->should_reexecute(), pd->rethrow_exception(),
!                                      pd->return_oop());
         !sd->is_top(); sd = sd->sender()) {
      sd->verify();
    }
  }
  
--- 2157,2167 ----
  
    PcDesc* pd = pc_desc_at(nativeCall_at(call_site)->return_address());
    assert(pd != NULL, "PcDesc must exist");
    for (ScopeDesc* sd = new ScopeDesc(this, pd->scope_decode_offset(),
                                       pd->obj_decode_offset(), pd->should_reexecute(), pd->rethrow_exception(),
!                                      pd->return_oop(), pd->return_vt());
         !sd->is_top(); sd = sd->sender()) {
      sd->verify();
    }
  }
  
*** 2517,2527 ****
  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->rethrow_exception(),
!                          p->return_oop());
    }
    return NULL;
  }
  
  void nmethod::print_nmethod_labels(outputStream* stream, address block_begin) const {
--- 2517,2527 ----
  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->rethrow_exception(),
!                          p->return_oop(), p->return_vt());
    }
    return NULL;
  }
  
  void nmethod::print_nmethod_labels(outputStream* stream, address block_begin) const {
*** 2693,2703 ****
              else
                st->print("<UNKNOWN>");
            }
          }
        }
!       st->print(" {reexecute=%d rethrow=%d return_oop=%d}", sd->should_reexecute(), sd->rethrow_exception(), sd->return_oop());
      }
  
      // Print all scopes
      for (;sd != NULL; sd = sd->sender()) {
        st->move_to(column);
--- 2693,2703 ----
              else
                st->print("<UNKNOWN>");
            }
          }
        }
!       st->print(" {reexecute=%d rethrow=%d return_oop=%d return_vt=%d}", sd->should_reexecute(), sd->rethrow_exception(), sd->return_oop(), sd->return_vt());
      }
  
      // Print all scopes
      for (;sd != NULL; sd = sd->sender()) {
        st->move_to(column);