src/share/vm/code/scopeDesc.hpp

*** 39,49 ****
   private:
    Method* _method;
    int _bci;
  
   public:
!   SimpleScopeDesc(nmethod* code,address pc) {
      PcDesc* pc_desc = code->pc_desc_at(pc);
      assert(pc_desc != NULL, "Must be able to find matching PcDesc");
      DebugInfoReadStream buffer(code, pc_desc->scope_decode_offset());
      int ignore_sender = buffer.read_int();
      _method           = buffer.read_method();
--- 39,49 ----
   private:
    Method* _method;
    int _bci;
  
   public:
!   SimpleScopeDesc(nmethod* code, address pc) {
      PcDesc* pc_desc = code->pc_desc_at(pc);
      assert(pc_desc != NULL, "Must be able to find matching PcDesc");
      DebugInfoReadStream buffer(code, pc_desc->scope_decode_offset());
      int ignore_sender = buffer.read_int();
      _method           = buffer.read_method();
*** 58,78 ****
  // 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
    Method* 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();
--- 58,79 ----
  // 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 rethrow_exception, 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 rethrow_exception, bool return_oop);
  
    // 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; }
    bool return_oop()       const { return _return_oop; }
  
    GrowableArray<ScopeValue*>*   locals();
    GrowableArray<ScopeValue*>*   expressions();
    GrowableArray<MonitorValue*>* monitors();
*** 93,102 ****
--- 94,104 ----
  
    // JVM state
    Method*       _method;
    int           _bci;
    bool          _reexecute;
+   bool          _rethrow_exception;
    bool          _return_oop;
  
    // Decoding offsets
    int _decode_offset;
    int _sender_decode_offset;