1.1 --- a/src/share/vm/code/scopeDesc.cpp Mon Feb 08 12:20:09 2010 -0800
1.2 +++ b/src/share/vm/code/scopeDesc.cpp Tue Feb 09 01:31:13 2010 -0800
1.3 @@ -26,19 +26,21 @@
1.4 # include "incls/_scopeDesc.cpp.incl"
1.5
1.6
1.7 -ScopeDesc::ScopeDesc(const nmethod* code, int decode_offset, int obj_decode_offset, bool reexecute) {
1.8 +ScopeDesc::ScopeDesc(const nmethod* code, int decode_offset, int obj_decode_offset, bool reexecute, bool return_oop) {
1.9 _code = code;
1.10 _decode_offset = decode_offset;
1.11 _objects = decode_object_values(obj_decode_offset);
1.12 _reexecute = reexecute;
1.13 + _return_oop = return_oop;
1.14 decode_body();
1.15 }
1.16
1.17 -ScopeDesc::ScopeDesc(const nmethod* code, int decode_offset, bool reexecute) {
1.18 +ScopeDesc::ScopeDesc(const nmethod* code, int decode_offset, bool reexecute, bool return_oop) {
1.19 _code = code;
1.20 _decode_offset = decode_offset;
1.21 _objects = decode_object_values(DebugInformationRecorder::serialized_null);
1.22 _reexecute = reexecute;
1.23 + _return_oop = return_oop;
1.24 decode_body();
1.25 }
1.26
1.27 @@ -48,6 +50,7 @@
1.28 _decode_offset = parent->_sender_decode_offset;
1.29 _objects = parent->_objects;
1.30 _reexecute = false; //reexecute only applies to the first scope
1.31 + _return_oop = false;
1.32 decode_body();
1.33 }
1.34
