src/hotspot/share/code/scopeDesc.hpp

rev 53032 : imported patch 8215205
rev 53033 : imported patch at_scope

*** 65,74 ****
--- 65,77 ----
    // 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 CompiledMethod* code, int decode_offset, bool reexecute, bool rethrow_exception, bool return_oop);
  
+   // Direct access to scope
+   ScopeDesc* at_offset(int decode_offset) { return new ScopeDesc(this, decode_offset); }
+ 
    // JVM state
    Method* method()      const { return _method; }
    int          bci()      const { return _bci;    }
    bool should_reexecute() const { return _reexecute; }
    bool rethrow_exception() const { return _rethrow_exception; }
*** 83,98 ****
    ScopeDesc* sender() const;
  
    // Returns where the scope was decoded
    int decode_offset() const { return _decode_offset; }
  
    // Tells whether sender() returns NULL
    bool is_top() const;
  
   private:
!   // Alternative constructor
    ScopeDesc(const ScopeDesc* parent);
  
    // JVM state
    Method*       _method;
    int           _bci;
    bool          _reexecute;
--- 86,105 ----
    ScopeDesc* sender() const;
  
    // Returns where the scope was decoded
    int decode_offset() const { return _decode_offset; }
  
+   int sender_decode_offset() const { return _sender_decode_offset; }
+ 
    // Tells whether sender() returns NULL
    bool is_top() const;
  
   private:
!   void initialize(const ScopeDesc* parent, int decode_offset);
!   // Alternative constructors
    ScopeDesc(const ScopeDesc* parent);
+   ScopeDesc(const ScopeDesc* parent, int decode_offset);
  
    // JVM state
    Method*       _method;
    int           _bci;
    bool          _reexecute;