test/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java

*** 49,59 ****
  import compiler.testlibrary.rtm.predicate.SupportedCPU;
  import compiler.testlibrary.rtm.predicate.SupportedVM;
  import jdk.internal.misc.Unsafe;
  import jdk.test.lib.Asserts;
  import jdk.test.lib.process.OutputAnalyzer;
- import jdk.test.lib.unsafe.UnsafeHelper;
  import jdk.test.lib.cli.CommandLineOptionTest;
  import jdk.test.lib.cli.predicate.AndPredicate;
  
  import java.util.List;
  
--- 49,58 ----
*** 156,166 ****
          // Following field have to be static in order to avoid escape analysis.
          @SuppressWarnings("UnsuedDeclaration")
          private static int field = 0;
          private static final int ITERATIONS = 10000;
          private static final int RANGE_CHECK_AT = ITERATIONS / 2;
!         private static final Unsafe UNSAFE = UnsafeHelper.getUnsafe();
          private final Object monitor = new Object();
  
          @Override
          public String getMethodWithLockName() {
              return this.getClass().getName() + "::forceAbort";
--- 155,165 ----
          // Following field have to be static in order to avoid escape analysis.
          @SuppressWarnings("UnsuedDeclaration")
          private static int field = 0;
          private static final int ITERATIONS = 10000;
          private static final int RANGE_CHECK_AT = ITERATIONS / 2;
!         private static final Unsafe UNSAFE = Unsafe.getUnsafe();
          private final Object monitor = new Object();
  
          @Override
          public String getMethodWithLockName() {
              return this.getClass().getName() + "::forceAbort";