test/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java

*** 154,167 ****
              return this.getClass().getName() + "::forceAbort";
          }
  
          @Override
          public String[] getMethodsToCompileNames() {
!             return new String[] {
!                 getMethodWithLockName(),
!                 sun.misc.Unsafe.class.getName() + "::forceAbort"
!             };
          }
  
          public void forceAbort(int a[], boolean abort) {
              try {
                  synchronized(monitor) {
--- 154,164 ----
              return this.getClass().getName() + "::forceAbort";
          }
  
          @Override
          public String[] getMethodsToCompileNames() {
!             return new String[] { getMethodWithLockName() };
          }
  
          public void forceAbort(int a[], boolean abort) {
              try {
                  synchronized(monitor) {
*** 180,196 ****
           * Test <inflate monitor>
           */
          public static void main(String args[]) throws Throwable {
              Test t = new Test();
  
!             if (Boolean.valueOf(args[0])) {
                  AbortProvoker.inflateMonitor(t.monitor);
              }
  
              int tmp[] = new int[1];
  
              for (int i = 0; i < Test.ITERATIONS; i++ ) {
                  if (i == Test.RANGE_CHECK_AT) {
                      t.forceAbort(new int[0], false);
                  } else {
                      boolean isThreshold
                              = (i == TestRTMAfterNonRTMDeopt.ABORT_THRESHOLD);
--- 177,195 ----
           * Test &lt;inflate monitor&gt;
           */
          public static void main(String args[]) throws Throwable {
              Test t = new Test();
  
!             boolean shouldBeInflated = Boolean.valueOf(args[0]);
!             if (shouldBeInflated) {
                  AbortProvoker.inflateMonitor(t.monitor);
              }
  
              int tmp[] = new int[1];
  
              for (int i = 0; i < Test.ITERATIONS; i++ ) {
+                 AbortProvoker.verifyMonitorState(t.monitor, shouldBeInflated);
                  if (i == Test.RANGE_CHECK_AT) {
                      t.forceAbort(new int[0], false);
                  } else {
                      boolean isThreshold
                              = (i == TestRTMAfterNonRTMDeopt.ABORT_THRESHOLD);