src/share/vm/code/scopeDesc.cpp

*** 28,54 ****
  #include "code/scopeDesc.hpp"
  #include "memory/resourceArea.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/handles.inline.hpp"
  
! ScopeDesc::ScopeDesc(const CompiledMethod* code, int decode_offset, int obj_decode_offset, bool reexecute, bool rethrow_exception, bool return_oop) {
    _code          = code;
    _decode_offset = decode_offset;
    _objects       = decode_object_values(obj_decode_offset);
    _reexecute     = reexecute;
    _rethrow_exception = rethrow_exception;
    _return_oop    = return_oop;
    decode_body();
  }
  
! ScopeDesc::ScopeDesc(const CompiledMethod* code, int decode_offset, bool reexecute, bool rethrow_exception, bool return_oop) {
    _code          = code;
    _decode_offset = decode_offset;
    _objects       = decode_object_values(DebugInformationRecorder::serialized_null);
    _reexecute     = reexecute;
    _rethrow_exception = rethrow_exception;
    _return_oop    = return_oop;
    decode_body();
  }
  
  
  ScopeDesc::ScopeDesc(const ScopeDesc* parent) {
--- 28,56 ----
  #include "code/scopeDesc.hpp"
  #include "memory/resourceArea.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/handles.inline.hpp"
  
! ScopeDesc::ScopeDesc(const CompiledMethod* code, int decode_offset, int obj_decode_offset, bool reexecute, bool rethrow_exception, bool return_oop, bool return_vt) {
    _code          = code;
    _decode_offset = decode_offset;
    _objects       = decode_object_values(obj_decode_offset);
    _reexecute     = reexecute;
    _rethrow_exception = rethrow_exception;
    _return_oop    = return_oop;
+   _return_vt     = return_vt;
    decode_body();
  }
  
! ScopeDesc::ScopeDesc(const CompiledMethod* code, int decode_offset, bool reexecute, bool rethrow_exception, bool return_oop, bool return_vt) {
    _code          = code;
    _decode_offset = decode_offset;
    _objects       = decode_object_values(DebugInformationRecorder::serialized_null);
    _reexecute     = reexecute;
    _rethrow_exception = rethrow_exception;
    _return_oop    = return_oop;
+   _return_vt     = return_vt;
    decode_body();
  }
  
  
  ScopeDesc::ScopeDesc(const ScopeDesc* parent) {
*** 56,65 ****
--- 58,68 ----
    _decode_offset = parent->_sender_decode_offset;
    _objects       = parent->_objects;
    _reexecute     = false; //reexecute only applies to the first scope
    _rethrow_exception = false;
    _return_oop    = false;
+   _return_vt     = false;
    decode_body();
  }
  
  
  void ScopeDesc::decode_body() {