--- old/src/share/vm/code/scopeDesc.hpp	Mon Jul  6 17:13:51 2009
+++ new/src/share/vm/code/scopeDesc.hpp	Mon Jul  6 17:13:51 2009
@@ -39,7 +39,8 @@
     DebugInfoReadStream buffer(code, pc_desc->scope_decode_offset());
     int ignore_sender = buffer.read_int();
     _method           = methodOop(buffer.read_oop());
-    _bci              = buffer.read_bci();
+    bool dummy_restart;
+    _bci              = buffer.read_bci_and_restart(dummy_restart);
   }
 
   methodOop method() { return _method; }
@@ -62,6 +63,7 @@
   // JVM state
   methodHandle method() const { return _method; }
   int          bci()    const { return _bci;    }
+  bool is_restart() { return _restart; }
 
   GrowableArray<ScopeValue*>*   locals();
   GrowableArray<ScopeValue*>*   expressions();
@@ -86,6 +88,7 @@
   // JVM state
   methodHandle  _method;
   int           _bci;
+  bool          _restart;
 
   // Decoding offsets
   int _decode_offset;