test/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java

*** 127,140 ****
              return this.getClass().getName() + "::forceAbort";
          }
  
          @Override
          public String[] getMethodsToCompileNames() {
!             return new String[] {
!                 getMethodWithLockName(),
!                 sun.misc.Unsafe.class.getName() + "::addressSize"
!             };
          }
  
          public void forceAbort(boolean abort) {
              synchronized(monitor) {
                  if (abort) {
--- 127,137 ----
              return this.getClass().getName() + "::forceAbort";
          }
  
          @Override
          public String[] getMethodsToCompileNames() {
!             return new String[] { getMethodWithLockName() };
          }
  
          public void forceAbort(boolean abort) {
              synchronized(monitor) {
                  if (abort) {
*** 148,162 ****
           * Test <inflate monitor>
           */
          public static void main(String args[]) throws Throwable {
              Asserts.assertGTE(args.length, 1, "One argument required.");
              Test t = new Test();
! 
!             if (Boolean.valueOf(args[0])) {
                  AbortProvoker.inflateMonitor(t.monitor);
              }
              for (int i = 0; i < AbortProvoker.DEFAULT_ITERATIONS; i++) {
                  t.forceAbort(
                          i == TestRTMDeoptOnLowAbortRatio.LOCKING_THRESHOLD);
              }
          }
      }
--- 145,160 ----
           * Test &lt;inflate monitor&gt;
           */
          public static void main(String args[]) throws Throwable {
              Asserts.assertGTE(args.length, 1, "One argument required.");
              Test t = new Test();
!             boolean shouldBeInflated = Boolean.valueOf(args[0]);
!             if (shouldBeInflated) {
                  AbortProvoker.inflateMonitor(t.monitor);
              }
              for (int i = 0; i < AbortProvoker.DEFAULT_ITERATIONS; i++) {
+                 AbortProvoker.verifyMonitorState(t.monitor, shouldBeInflated);
                  t.forceAbort(
                          i == TestRTMDeoptOnLowAbortRatio.LOCKING_THRESHOLD);
              }
          }
      }