*** old/src/share/vm/opto/runtime.hpp	Mon Mar 24 16:32:03 2014
--- new/src/share/vm/opto/runtime.hpp	Mon Mar 24 16:32:03 2014

*** 27,36 ****
--- 27,37 ----
  
  #include "code/codeBlob.hpp"
  #include "opto/machnode.hpp"
  #include "opto/type.hpp"
  #include "runtime/biasedLocking.hpp"
+ #include "runtime/rtmLocking.hpp"
  #include "runtime/deoptimization.hpp"
  #include "runtime/vframe.hpp"
  
  //------------------------------OptoRuntime------------------------------------
  // Opto compiler runtime routines

*** 59,69 ****
--- 60,71 ----
  public:
      enum CounterTag {
      NoTag,
      LockCounter,
      EliminatedLockCounter,
!     BiasedLockingCounter,
+     RTMLockingCounter
    };
  
  private:
    const char *  _name;
    int           _count;

*** 83,93 ****
--- 85,95 ----
    CounterTag tag() const        { return _tag; }
    void set_tag(CounterTag tag)  { _tag = tag; }
  
    NamedCounter* next() const    { return _next; }
    void set_next(NamedCounter* next) {
!     assert(_next == NULL || next == NULL, "already set");
      _next = next;
    }
  
  };
  

*** 100,109 ****
--- 102,123 ----
      NamedCounter(n, BiasedLockingCounter), _counters() {}
  
    BiasedLockingCounters* counters() { return &_counters; }
  };
  
+ 
+ class RTMLockingNamedCounter : public NamedCounter {
+  private:
+  RTMLockingCounters _counters;
+ 
+  public:
+   RTMLockingNamedCounter(const char *n) :
+     NamedCounter(n, RTMLockingCounter), _counters() {}
+ 
+   RTMLockingCounters* counters() { return &_counters; }
+ };
+ 
  typedef const TypeFunc*(*TypeFunc_generator)();
  
  class OptoRuntime : public AllStatic {
    friend class Matcher;  // allow access to stub names