test/compiler/rtm/locking/TestRTMTotalCountIncrRate.java

*** 47,57 ****
  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;
  
--- 47,56 ----
*** 111,121 ****
          }
      }
  
      public static class Test implements CompilableTest {
          private static final long TOTAL_ITERATIONS = 10000L;
!         private static final Unsafe UNSAFE = UnsafeHelper.getUnsafe();
          private final Object monitor = new Object();
          // Following field have to be static in order to avoid escape analysis.
          @SuppressWarnings("UnsuedDeclaration")
          private static int field = 0;
  
--- 110,120 ----
          }
      }
  
      public static class Test implements CompilableTest {
          private static final long TOTAL_ITERATIONS = 10000L;
!         private static final Unsafe UNSAFE = Unsafe.getUnsafe();
          private final Object monitor = new Object();
          // Following field have to be static in order to avoid escape analysis.
          @SuppressWarnings("UnsuedDeclaration")
          private static int field = 0;