diff -r 99269dbf4ba8 -r 6dbf1a175d6b src/share/vm/opto/locknode.hpp
--- a/src/share/vm/opto/locknode.hpp	Fri Mar 14 15:26:33 2008 -0700
+++ b/src/share/vm/opto/locknode.hpp	Fri Mar 14 16:40:42 2008 -0700
@@ -27,6 +27,7 @@
 public:
   const int _slot;
   RegMask   _inmask;
+  bool _is_eliminated;    // indicates this lock was safely eliminated
 
   BoxLockNode( int lock );
   virtual int Opcode() const;
@@ -42,6 +43,10 @@
 
   static OptoReg::Name stack_slot(Node* box_node);
 
+  bool is_eliminated()  { return _is_eliminated; }
+  // mark lock as eliminated.
+  void set_eliminated() { _is_eliminated = true; }
+
 #ifndef PRODUCT
   virtual void format( PhaseRegAlloc *, outputStream *st ) const;
   virtual void dump_spec(outputStream *st) const { st->print("  Lock %d",_slot); }