1.1 --- a/src/share/vm/opto/locknode.hpp Thu Jan 12 12:28:59 2012 -0800 1.2 +++ b/src/share/vm/opto/locknode.hpp Thu Jan 12 14:45:04 2012 -0800 1.3 @@ -49,9 +49,9 @@ 1.4 1.5 //------------------------------BoxLockNode------------------------------------ 1.6 class BoxLockNode : public Node { 1.7 - const int _slot; 1.8 - RegMask _inmask; 1.9 - bool _is_eliminated; // indicates this lock was safely eliminated 1.10 + const int _slot; // stack slot 1.11 + RegMask _inmask; // OptoReg corresponding to stack slot 1.12 + bool _is_eliminated; // Associated locks were safely eliminated 1.13 1.14 public: 1.15 BoxLockNode( int lock ); 1.16 @@ -68,7 +68,9 @@ 1.17 1.18 static OptoReg::Name reg(Node* box_node); 1.19 static BoxLockNode* box_node(Node* box_node); 1.20 - static bool same_slot(Node* box1, Node* box2); 1.21 + static bool same_slot(Node* box1, Node* box2) { 1.22 + return box1->as_BoxLock()->_slot == box2->as_BoxLock()->_slot; 1.23 + } 1.24 int stack_slot() const { return _slot; } 1.25 1.26 bool is_eliminated() const { return _is_eliminated; }