src/share/vm/code/scopeDesc.hpp

*** 37,47 ****
      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           = methodOop(buffer.read_oop());
!     _bci              = buffer.read_bci();
    }
  
    methodOop method() { return _method; }
    int bci() { return _bci; }
  };
--- 37,48 ----
      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           = methodOop(buffer.read_oop());
!     bool dummy_restart;
!     _bci              = buffer.read_bci_and_restart(dummy_restart);
    }
  
    methodOop method() { return _method; }
    int bci() { return _bci; }
  };
*** 60,69 ****
--- 61,71 ----
    ScopeDesc(const nmethod* code, int decode_offset);
  
    // JVM state
    methodHandle method() const { return _method; }
    int          bci()    const { return _bci;    }
+   bool is_restart() { return _restart; }
  
    GrowableArray<ScopeValue*>*   locals();
    GrowableArray<ScopeValue*>*   expressions();
    GrowableArray<MonitorValue*>* monitors();
    GrowableArray<ScopeValue*>*   objects();
*** 84,93 ****
--- 86,96 ----
    ScopeDesc(const ScopeDesc* parent);
  
    // JVM state
    methodHandle  _method;
    int           _bci;
+   bool          _restart;
  
    // Decoding offsets
    int _decode_offset;
    int _sender_decode_offset;
    int _locals_decode_offset;