src/share/vm/code/scopeDesc.hpp

*** 50,70 ****
  // nmethods possible; each scopeDesc describes a method activation
  
  class ScopeDesc : public ResourceObj {
   public:
    // Constructor
!   ScopeDesc(const nmethod* code, int decode_offset, int obj_decode_offset, bool reexecute);
  
    // Calls above, giving default value of "serialized_null" to the
    // "obj_decode_offset" argument.  (We don't use a default argument to
    // avoid a .hpp-.hpp dependency.)
!   ScopeDesc(const nmethod* code, int decode_offset, bool reexecute);
  
    // JVM state
    methodHandle method()   const { return _method; }
    int          bci()      const { return _bci;    }
    bool should_reexecute() const { return _reexecute; }
  
    GrowableArray<ScopeValue*>*   locals();
    GrowableArray<ScopeValue*>*   expressions();
    GrowableArray<MonitorValue*>* monitors();
    GrowableArray<ScopeValue*>*   objects();
--- 50,71 ----
  // nmethods possible; each scopeDesc describes a method activation
  
  class ScopeDesc : public ResourceObj {
   public:
    // Constructor
!   ScopeDesc(const nmethod* code, int decode_offset, int obj_decode_offset, bool reexecute, bool return_oop);
  
    // Calls above, giving default value of "serialized_null" to the
    // "obj_decode_offset" argument.  (We don't use a default argument to
    // avoid a .hpp-.hpp dependency.)
!   ScopeDesc(const nmethod* code, int decode_offset, bool reexecute, bool return_oop);
  
    // JVM state
    methodHandle method()   const { return _method; }
    int          bci()      const { return _bci;    }
    bool should_reexecute() const { return _reexecute; }
+   bool return_oop()       const { return _return_oop; }
  
    GrowableArray<ScopeValue*>*   locals();
    GrowableArray<ScopeValue*>*   expressions();
    GrowableArray<MonitorValue*>* monitors();
    GrowableArray<ScopeValue*>*   objects();
*** 86,95 ****
--- 87,97 ----
  
    // JVM state
    methodHandle  _method;
    int           _bci;
    bool          _reexecute;
+   bool          _return_oop;
  
    // Decoding offsets
    int _decode_offset;
    int _sender_decode_offset;
    int _locals_decode_offset;