--- a/hotspot/src/share/vm/opto/locknode.hpp Thu Jan 12 12:28:59 2012 -0800
+++ b/hotspot/src/share/vm/opto/locknode.hpp Thu Jan 12 14:45:04 2012 -0800
@@ -49,9 +49,9 @@
//------------------------------BoxLockNode------------------------------------
class BoxLockNode : public Node {
- const int _slot;
- RegMask _inmask;
- bool _is_eliminated; // indicates this lock was safely eliminated
+ const int _slot; // stack slot
+ RegMask _inmask; // OptoReg corresponding to stack slot
+ bool _is_eliminated; // Associated locks were safely eliminated
public:
BoxLockNode( int lock );
@@ -68,7 +68,9 @@
static OptoReg::Name reg(Node* box_node);
static BoxLockNode* box_node(Node* box_node);
- static bool same_slot(Node* box1, Node* box2);
+ static bool same_slot(Node* box1, Node* box2) {
+ return box1->as_BoxLock()->_slot == box2->as_BoxLock()->_slot;
+ }
int stack_slot() const { return _slot; }
bool is_eliminated() const { return _is_eliminated; }