*** old/src/share/vm/opto/callnode.hpp	Mon Jul  6 14:35:49 2009
--- new/src/share/vm/opto/callnode.hpp	Mon Jul  6 14:35:48 2009

*** 186,195 ****
--- 186,196 ----
    uint              _monoff;    // Offset to monitors in input edge mapping
    uint              _scloff;    // Offset to fields of scalar objs in input edge mapping
    uint              _endoff;    // Offset to end of input edge mapping
    uint              _sp;        // Jave Expression Stack Pointer for this state
    int               _bci;       // Byte Code Index of this JVM point
+   bool              _restart;   // whether this bytecode need to be re-executed
    ciMethod*         _method;    // Method Pointer
    SafePointNode*    _map;       // Map node associated with this scope
  public:
    friend class Compile;
  

*** 222,231 ****
--- 223,233 ----
    bool        is_mon(uint i) const { return i >= _monoff && i < _scloff; }
    bool        is_scl(uint i) const { return i >= _scloff && i < _endoff; }
  
    uint              sp()     const { return _sp; }
    int               bci()    const { return _bci; }
+   bool              is_restart() const { return _restart; }
    bool          has_method() const { return _method != NULL; }
    ciMethod*         method() const { assert(has_method(), ""); return _method; }
    JVMState*         caller() const { return _caller; }
    SafePointNode*    map()    const { return _map; }
    uint              depth()  const { return _depth; }

*** 266,275 ****
--- 268,278 ----
      _locoff = _stkoff = _monoff = _scloff = _endoff = off;
    }
    void              set_map(SafePointNode *map) { _map = map; }
    void              set_sp(uint sp) { _sp = sp; }
    void              set_bci(int bci) { _bci = bci; }
+   void              set_restart(bool restart) {_restart = restart;}
  
    // Miscellaneous utility functions
    JVMState* clone_deep(Compile* C) const;    // recursively clones caller chain
    JVMState* clone_shallow(Compile* C) const; // retains uncloned caller