*** old/src/share/vm/code/scopeDesc.cpp	Mon Feb  8 11:00:32 2010
--- new/src/share/vm/code/scopeDesc.cpp	Mon Feb  8 11:00:32 2010

*** 24,55 ****
--- 24,58 ----
  
  # include "incls/_precompiled.incl"
  # include "incls/_scopeDesc.cpp.incl"
  
  
! ScopeDesc::ScopeDesc(const nmethod* code, int decode_offset, int obj_decode_offset, bool reexecute, bool return_oop) {
    _code          = code;
    _decode_offset = decode_offset;
    _objects       = decode_object_values(obj_decode_offset);
    _reexecute     = reexecute;
+   _return_oop    = return_oop;
    decode_body();
  }
  
! ScopeDesc::ScopeDesc(const nmethod* code, int decode_offset, bool reexecute, bool return_oop) {
    _code          = code;
    _decode_offset = decode_offset;
    _objects       = decode_object_values(DebugInformationRecorder::serialized_null);
    _reexecute     = reexecute;
+   _return_oop    = return_oop;
    decode_body();
  }
  
  
  ScopeDesc::ScopeDesc(const ScopeDesc* parent) {
    _code          = parent->_code;
    _decode_offset = parent->_sender_decode_offset;
    _objects       = parent->_objects;
    _reexecute     = false; //reexecute only applies to the first scope
+   _return_oop    = false;
    decode_body();
  }
  
  
  void ScopeDesc::decode_body() {

*** 173,182 ****
--- 176,186 ----
    if (WizardMode) {
      st->print("ScopeDesc[%d]@" PTR_FORMAT " ", _decode_offset, _code->instructions_begin());
      st->print_cr(" offset:     %d",    _decode_offset);
      st->print_cr(" bci:        %d",    bci());
      st->print_cr(" reexecute:  %s",    should_reexecute() ? "true" : "false");
+     st->print_cr(" return_oop: %s",    return_oop() ? "true" : "false");
      st->print_cr(" locals:     %d",    _locals_decode_offset);
      st->print_cr(" stack:      %d",    _expressions_decode_offset);
      st->print_cr(" monitor:    %d",    _monitors_decode_offset);
      st->print_cr(" sender:     %d",    _sender_decode_offset);
    }