--- a/hotspot/test/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java Tue Sep 20 17:30:33 2016 +0300
+++ b/hotspot/test/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java Tue Sep 20 16:34:45 2016 -0400
@@ -52,7 +52,6 @@
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;
@@ -159,7 +158,7 @@
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 static final Unsafe UNSAFE = Unsafe.getUnsafe();
private final Object monitor = new Object();
@Override