--- old/src/share/vm/opto/locknode.hpp 2014-03-17 11:39:32.000000000 -0700 +++ new/src/share/vm/opto/locknode.hpp 2014-03-17 11:39:32.000000000 -0700 @@ -93,12 +93,16 @@ class FastLockNode: public CmpNode { private: BiasedLockingCounters* _counters; + RTMLockingCounters* _rtmcounters; // RTM lock counters for inflated locks + RTMLockingCounters* _stackrtmcounters; // RTM lock counters for stack locks public: FastLockNode(Node *ctrl, Node *oop, Node *box) : CmpNode(oop,box) { init_req(0,ctrl); init_class_id(Class_FastLock); _counters = NULL; + _rtmcounters = NULL; + _stackrtmcounters = NULL; } Node* obj_node() const { return in(1); } Node* box_node() const { return in(2); } @@ -107,13 +111,17 @@ // FastLock and FastUnlockNode do not hash, we need one for each correspoding // LockNode/UnLockNode to avoid creating Phi's. virtual uint hash() const ; // { return NO_HASH; } + virtual uint size_of() const; virtual uint cmp( const Node &n ) const ; // Always fail, except on self virtual int Opcode() const; virtual const Type *Value( PhaseTransform *phase ) const { return TypeInt::CC; } const Type *sub(const Type *t1, const Type *t2) const { return TypeInt::CC;} void create_lock_counter(JVMState* s); + void create_rtm_lock_counter(JVMState* state); BiasedLockingCounters* counters() const { return _counters; } + RTMLockingCounters* rtmcounters() const { return _rtmcounters; } + RTMLockingCounters* stackrtmcounters() const { return _stackrtmcounters; } };