--- a/hotspot/test/compiler/c2/5057225/Test5057225.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/c2/5057225/Test5057225.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
  * @test
  * @bug 5057225
  * @summary Remove useless I2L conversions
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary
  * @run main/othervm -Xcomp -XX:CompileOnly=Test5057225.doload Test5057225
  */

--- a/hotspot/test/compiler/c2/6603011/Test.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/c2/6603011/Test.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
  * @test
  * @bug 6603011
  * @summary long/int division by constant
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary
  * @run main/othervm -Xcomp -Xbatch -XX:-Inline Test
  */

--- a/hotspot/test/compiler/c2/6800154/Test6800154.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/c2/6800154/Test6800154.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
  * @test
  * @bug 6800154
  * @summary Add comments to long_by_long_mulhi() for better understandability
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary
  * @run main/othervm -Xcomp -XX:CompileOnly=Test6800154.divcomp Test6800154
  */

--- a/hotspot/test/compiler/c2/6805724/Test6805724.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/c2/6805724/Test6805724.java	Sun May 01 12:47:00 2016 +0300
@@ -26,6 +26,7 @@
  * @bug 6805724
  * @summary ModLNode::Ideal() generates functionally incorrect graph
  *          when divisor is any (2^k-1) constant.
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary
  * @run main/othervm -Xcomp -XX:CompileOnly=Test6805724.fcomp Test6805724
  */

--- a/hotspot/test/compiler/c2/6968348/Test6968348.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/c2/6968348/Test6968348.java	Sun May 01 12:47:00 2016 +0300
@@ -31,7 +31,7 @@
  * @run main Test6968348
  */
 
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 import java.lang.reflect.*;
 
 public class Test6968348 {
@@ -40,7 +40,7 @@
     static int array_long_base_offset;
 
     public static void main(String[] args) throws Exception {
-        Class c = Test6968348.class.getClassLoader().loadClass("sun.misc.Unsafe");
+        Class c = Test6968348.class.getClassLoader().loadClass("jdk.internal.misc.Unsafe");
         Field f = c.getDeclaredField("theUnsafe");
         f.setAccessible(true);
         unsafe = (Unsafe)f.get(c);

--- a/hotspot/test/compiler/c2/7190310/Test7190310_unsafe.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/c2/7190310/Test7190310_unsafe.java	Sun May 01 12:47:00 2016 +0300
@@ -32,7 +32,7 @@
 
 import java.lang.ref.*;
 import java.lang.reflect.*;
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 public class Test7190310_unsafe {
 
@@ -48,7 +48,7 @@
   private TestObject obj;
 
   public static void main(String[] args) throws Exception {
-    Class c = Test7190310_unsafe.class.getClassLoader().loadClass("sun.misc.Unsafe");
+    Class c = Test7190310_unsafe.class.getClassLoader().loadClass("jdk.internal.misc.Unsafe");
     Field f = c.getDeclaredField("theUnsafe");
     f.setAccessible(true);
     Unsafe unsafe = (Unsafe)f.get(c);

--- a/hotspot/test/compiler/c2/8004867/TestIntUnsafeCAS.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/c2/8004867/TestIntUnsafeCAS.java	Sun May 01 12:47:00 2016 +0300
@@ -32,7 +32,7 @@
  * @run main/othervm/timeout=300 -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:+OptimizeFill TestIntUnsafeCAS
  */
 
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 import java.lang.reflect.*;
 
 public class TestIntUnsafeCAS {
@@ -47,7 +47,7 @@
   private static final int BASE;
   static {
     try {
-      Class c = TestIntUnsafeCAS.class.getClassLoader().loadClass("sun.misc.Unsafe");
+      Class c = TestIntUnsafeCAS.class.getClassLoader().loadClass("jdk.internal.misc.Unsafe");
       Field f = c.getDeclaredField("theUnsafe");
       f.setAccessible(true);
       unsafe = (Unsafe)f.get(c);

--- a/hotspot/test/compiler/c2/8004867/TestIntUnsafeVolatile.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/c2/8004867/TestIntUnsafeVolatile.java	Sun May 01 12:47:00 2016 +0300
@@ -32,7 +32,7 @@
  * @run main/othervm/timeout=300 -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:+OptimizeFill TestIntUnsafeVolatile
  */
 
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 import java.lang.reflect.*;
 
 public class TestIntUnsafeVolatile {
@@ -47,7 +47,7 @@
   private static final int BASE;
   static {
     try {
-      Class c = TestIntUnsafeVolatile.class.getClassLoader().loadClass("sun.misc.Unsafe");
+      Class c = TestIntUnsafeVolatile.class.getClassLoader().loadClass("jdk.internal.misc.Unsafe");
       Field f = c.getDeclaredField("theUnsafe");
       f.setAccessible(true);
       unsafe = (Unsafe)f.get(c);

--- a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeDynamic2CompiledTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeDynamic2CompiledTest.java	Sun May 01 12:47:00 2016 +0300
@@ -24,6 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.org.objectweb.asm
  * @build compiler.calls.common.InvokeDynamic
  * @build compiler.calls.common.InvokeDynamicPatcher

--- a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeDynamic2InterpretedTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeDynamic2InterpretedTest.java	Sun May 01 12:47:00 2016 +0300
@@ -24,6 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.org.objectweb.asm
  * @build compiler.calls.common.InvokeDynamic
  * @build compiler.calls.common.InvokeDynamicPatcher

--- a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeDynamic2NativeTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeDynamic2NativeTest.java	Sun May 01 12:47:00 2016 +0300
@@ -24,6 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.org.objectweb.asm
  * @build compiler.calls.common.InvokeDynamic
  * @build compiler.calls.common.InvokeDynamicPatcher

--- a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeInterface2CompiledTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeInterface2CompiledTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeInterface
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeInterface2InterpretedTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeInterface2InterpretedTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeInterface
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeInterface2NativeTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeInterface2NativeTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeInterface
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeSpecial2CompiledTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeSpecial2CompiledTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeSpecial
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeSpecial2InterpretedTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeSpecial2InterpretedTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeSpecial
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeSpecial2NativeTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeSpecial2NativeTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeSpecial
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeStatic2CompiledTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeStatic2CompiledTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeStatic
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeStatic2InterpretedTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeStatic2InterpretedTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeStatic
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeStatic2NativeTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeStatic2NativeTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeStatic
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeVirtual2CompiledTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeVirtual2CompiledTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeVirtual
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeVirtual2InterpretedTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeVirtual2InterpretedTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeVirtual
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeVirtual2NativeTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeVirtual2NativeTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeVirtual
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2CompiledTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2CompiledTest.java	Sun May 01 12:47:00 2016 +0300
@@ -24,6 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.org.objectweb.asm
  * @build compiler.calls.common.InvokeDynamic
  * @build compiler.calls.common.InvokeDynamicPatcher

--- a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2InterpretedTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2InterpretedTest.java	Sun May 01 12:47:00 2016 +0300
@@ -24,6 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.org.objectweb.asm
  * @build compiler.calls.common.InvokeDynamic
  * @build compiler.calls.common.InvokeDynamicPatcher

--- a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2NativeTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2NativeTest.java	Sun May 01 12:47:00 2016 +0300
@@ -24,6 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.org.objectweb.asm
  * @build compiler.calls.common.InvokeDynamic
  * @build compiler.calls.common.InvokeDynamicPatcher

--- a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeInterface2CompiledTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeInterface2CompiledTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeInterface
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeInterface2InterpretedTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeInterface2InterpretedTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeInterface
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeInterface2NativeTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeInterface2NativeTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeInterface
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2CompiledTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2CompiledTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeSpecial
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2InterpretedTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2InterpretedTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeSpecial
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2NativeTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2NativeTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeSpecial
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeStatic2CompiledTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeStatic2CompiledTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeStatic
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeStatic2InterpretedTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeStatic2InterpretedTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeStatic
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeStatic2NativeTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeStatic2NativeTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeStatic
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2CompiledTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2CompiledTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeVirtual
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2InterpretedTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2InterpretedTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeVirtual
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2NativeTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2NativeTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeVirtual
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/calls/fromNative/NativeInvokeSpecial2CompiledTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromNative/NativeInvokeSpecial2CompiledTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeSpecial
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/calls/fromNative/NativeInvokeSpecial2InterpretedTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromNative/NativeInvokeSpecial2InterpretedTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeSpecial
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/calls/fromNative/NativeInvokeSpecial2NativeTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromNative/NativeInvokeSpecial2NativeTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeSpecial
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/calls/fromNative/NativeInvokeStatic2CompiledTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromNative/NativeInvokeStatic2CompiledTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeStatic
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/calls/fromNative/NativeInvokeStatic2InterpretedTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromNative/NativeInvokeStatic2InterpretedTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeStatic
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/calls/fromNative/NativeInvokeStatic2NativeTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromNative/NativeInvokeStatic2NativeTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeStatic
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/calls/fromNative/NativeInvokeVirtual2CompiledTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromNative/NativeInvokeVirtual2CompiledTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeVirtual
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/calls/fromNative/NativeInvokeVirtual2InterpretedTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromNative/NativeInvokeVirtual2InterpretedTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeVirtual
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/calls/fromNative/NativeInvokeVirtual2NativeTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/calls/fromNative/NativeInvokeVirtual2NativeTest.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /testlibrary /
  * @build compiler.calls.common.InvokeVirtual
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/classUnloading/anonymousClass/TestAnonymousClassUnloading.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/classUnloading/anonymousClass/TestAnonymousClassUnloading.java	Sun May 01 12:47:00 2016 +0300
@@ -22,7 +22,7 @@
  */
 
 import sun.hotspot.WhiteBox;
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 import java.io.IOException;
 import java.lang.reflect.Method;

--- a/hotspot/test/compiler/classUnloading/methodUnloading/TestMethodUnloading.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/classUnloading/methodUnloading/TestMethodUnloading.java	Sun May 01 12:47:00 2016 +0300
@@ -31,6 +31,7 @@
  * @test MethodUnloadingTest
  * @bug 8029443
  * @summary "Tests the unloading of methods to to class unloading"
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib
  * @build TestMethodUnloading
  * @build WorkerClass

--- a/hotspot/test/compiler/codecache/OverflowCodeCacheTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/codecache/OverflowCodeCacheTest.java	Sun May 01 12:47:00 2016 +0300
@@ -35,6 +35,7 @@
  * @test OverflowCodeCacheTest
  * @bug 8059550
  * @library /testlibrary /test/lib
+ * @modules java.base/jdk.internal.misc
  * @modules java.management
  * @build OverflowCodeCacheTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/codecache/dtrace/SegmentedCodeCacheDtraceTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/codecache/dtrace/SegmentedCodeCacheDtraceTest.java	Sun May 01 12:47:00 2016 +0300
@@ -48,6 +48,7 @@
  * @test SegmentedCodeCacheDtraceTest
  * @bug 8015774
  * @requires os.family=="solaris"
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary / /test/lib
  * @build SegmentedCodeCacheDtraceTestWorker
  * @run main ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/codecache/jmx/BeanTypeTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/codecache/jmx/BeanTypeTest.java	Sun May 01 12:47:00 2016 +0300
@@ -28,6 +28,7 @@
 /**
  * @test BeanTypeTest
  * @library /testlibrary /test/lib
+ * @modules java.base/jdk.internal.misc
  * @modules java.management
  * @build BeanTypeTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/codecache/jmx/CodeHeapBeanPresenceTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/codecache/jmx/CodeHeapBeanPresenceTest.java	Sun May 01 12:47:00 2016 +0300
@@ -28,6 +28,7 @@
 /**
  * @test CodeHeapBeanPresenceTest
  * @library /testlibrary /test/lib
+ * @modules java.base/jdk.internal.misc
  * @modules java.management
  * @build CodeHeapBeanPresenceTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/codecache/jmx/ManagerNamesTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/codecache/jmx/ManagerNamesTest.java	Sun May 01 12:47:00 2016 +0300
@@ -28,6 +28,7 @@
 /**
  * @test ManagerNamesTest
  * @library /testlibrary /test/lib
+ * @modules java.base/jdk.internal.misc
  * @modules java.management
  * @build ManagerNamesTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/codecache/jmx/MemoryPoolsPresenceTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/codecache/jmx/MemoryPoolsPresenceTest.java	Sun May 01 12:47:00 2016 +0300
@@ -33,6 +33,7 @@
 /**
  * @test MemoryPoolsPresenceTest
  * @library /testlibrary /test/lib
+ * @modules java.base/jdk.internal.misc
  * @modules java.management
  * @build MemoryPoolsPresenceTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/codecache/jmx/PoolsIndependenceTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/codecache/jmx/PoolsIndependenceTest.java	Sun May 01 12:47:00 2016 +0300
@@ -37,6 +37,7 @@
 
 /*
  * @test PoolsIndependenceTest
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib
  * @build PoolsIndependenceTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/codegen/6823354/Test6823354.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/codegen/6823354/Test6823354.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
  * @test
  * @bug 6823354
  * @summary These methods can be instrinsified by using bit scan, bit test, and population count instructions.
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary
  * @run main/othervm -Xcomp -XX:CompileOnly=Test6823354.lzcomp,Test6823354.tzcomp,.dolzcomp,.dotzcomp Test6823354
  */

--- a/hotspot/test/compiler/compilercontrol/InlineMatcherTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/compilercontrol/InlineMatcherTest.java	Sun May 01 12:47:00 2016 +0300
@@ -24,6 +24,7 @@
 /*
  * @test InlineMatcherTest
  * @bug 8074095
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib
  * @build sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/compilercontrol/commandfile/CompileOnlyTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/compilercontrol/commandfile/CompileOnlyTest.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
  * @test
  * @bug 8137167
  * @summary Tests CompileCommand=compileonly
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
  * @build compiler.compilercontrol.commandfile.CompileOnlyTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/compilercontrol/commandfile/ExcludeTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/compilercontrol/commandfile/ExcludeTest.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
  * @test
  * @bug 8137167
  * @summary Tests CompileCommand=exclude
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
  * @build compiler.compilercontrol.commandfile.ExcludeTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/compilercontrol/commandfile/LogTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/compilercontrol/commandfile/LogTest.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
  * @test
  * @bug 8137167
  * @summary Tests CompileCommand=log
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
  * @build compiler.compilercontrol.commandfile.LogTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/compilercontrol/commandfile/PrintTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/compilercontrol/commandfile/PrintTest.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
  * @test
  * @bug 8137167
  * @summary Tests CompileCommand=print
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
  * @build compiler.compilercontrol.commandfile.PrintTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/compilercontrol/commands/CompileOnlyTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/compilercontrol/commands/CompileOnlyTest.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
  * @test
  * @bug 8137167
  * @summary Tests CompileCommand=compileonly
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
  * @build compiler.compilercontrol.commands.CompileOnlyTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/compilercontrol/commands/ExcludeTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/compilercontrol/commands/ExcludeTest.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
  * @test
  * @bug 8137167
  * @summary Tests CompileCommand=exclude
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
  * @build compiler.compilercontrol.commands.ExcludeTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/compilercontrol/commands/LogTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/compilercontrol/commands/LogTest.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
  * @test
  * @bug 8137167
  * @summary Tests CompileCommand=log
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
  * @build compiler.compilercontrol.commands.LogTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/compilercontrol/commands/PrintTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/compilercontrol/commands/PrintTest.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
  * @test
  * @bug 8137167
  * @summary Tests CompileCommand=print
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
  * @build compiler.compilercontrol.commands.PrintTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/compilercontrol/directives/CompileOnlyTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/compilercontrol/directives/CompileOnlyTest.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
  * @test
  * @bug 8137167
  * @summary Tests directives to be able to compile only specified  methods
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
  * @build compiler.compilercontrol.directives.CompileOnlyTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/compilercontrol/directives/ExcludeTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/compilercontrol/directives/ExcludeTest.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
  * @test
  * @bug 8137167
  * @summary Tests directives to be able to exclude methods from compilation
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
  * @build compiler.compilercontrol.directives.ExcludeTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/compilercontrol/directives/LogTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/compilercontrol/directives/LogTest.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
  * @test
  * @bug 8137167
  * @summary Tests directives to be able to turn on LogCompilation
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
  * @build compiler.compilercontrol.directives.LogTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/compilercontrol/directives/PrintTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/compilercontrol/directives/PrintTest.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
  * @test
  * @bug 8137167
  * @summary Tests directives to be able to turn on print_assembly
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
  * @build compiler.compilercontrol.directives.PrintTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/compilercontrol/jcmd/AddAndRemoveTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/compilercontrol/jcmd/AddAndRemoveTest.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
  * @test
  * @bug 8137167
  * @summary Tests directives to be able to add and remove directives
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
  * @build compiler.compilercontrol.jcmd.AddAndRemoveTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/compilercontrol/jcmd/AddCompileOnlyTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/compilercontrol/jcmd/AddCompileOnlyTest.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
  * @test
  * @bug 8137167
  * @summary Tests jcmd to be able to add a directive to compile only specified methods
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
  * @build compiler.compilercontrol.jcmd.AddCompileOnlyTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/compilercontrol/jcmd/AddExcludeTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/compilercontrol/jcmd/AddExcludeTest.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
  * @test
  * @bug 8137167
  * @summary Tests jcmd to be able to add a directive to exclude only specified methods
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
  * @build compiler.compilercontrol.jcmd.AddExcludeTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/compilercontrol/jcmd/AddLogTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/compilercontrol/jcmd/AddLogTest.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
  * @test
  * @bug 8137167
  * @summary Tests jcmd to be able to add a directive to log only specified methods
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
  * @build compiler.compilercontrol.jcmd.AddLogTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/compilercontrol/jcmd/AddPrintAssemblyTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/compilercontrol/jcmd/AddPrintAssemblyTest.java	Sun May 01 12:47:00 2016 +0300
@@ -26,6 +26,7 @@
  * @bug 8137167
  * @summary Tests jcmd to be able to add a directive to print assembly
  *          only for specified methods
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
  * @build compiler.compilercontrol.jcmd.AddPrintAssemblyTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java	Sun May 01 12:47:00 2016 +0300
@@ -26,6 +26,7 @@
  * @bug 8137167
  * @ignore 8140405
  * @summary Tests jcmd to be able to clear directives added via options
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
  * @build compiler.compilercontrol.jcmd.ClearDirectivesFileStackTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/compilercontrol/jcmd/ClearDirectivesStackTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/compilercontrol/jcmd/ClearDirectivesStackTest.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
  * @test
  * @bug 8137167
  * @summary Tests clear JCMD command
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
  * @build compiler.compilercontrol.jcmd.ClearDirectivesStackTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/compilercontrol/jcmd/PrintDirectivesTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/compilercontrol/jcmd/PrintDirectivesTest.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
  * @test
  * @bug 8137167
  * @summary Tests jcmd to be able to add a directive to compile only specified methods
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
  * @build compiler.compilercontrol.jcmd.PrintDirectivesTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/compilercontrol/jcmd/StressAddMultiThreadedTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/compilercontrol/jcmd/StressAddMultiThreadedTest.java	Sun May 01 12:47:00 2016 +0300
@@ -26,6 +26,7 @@
  * @bug 8137167
  * @summary Tests jcmd to be able to add a lot of huge directive files with
  *          parallel executed jcmds until timeout has reached
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
  * @build compiler.compilercontrol.jcmd.StressAddMultiThreadedTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/compilercontrol/matcher/MethodMatcherTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/compilercontrol/matcher/MethodMatcherTest.java	Sun May 01 12:47:00 2016 +0300
@@ -40,6 +40,7 @@
  * @test
  * @bug 8135068
  * @summary Tests CompilerCommand's method matcher
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib /compiler/whitebox ../share /
  * @build compiler.compilercontrol.matcher.MethodMatcherTest
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/compilercontrol/mixed/RandomCommandsTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/compilercontrol/mixed/RandomCommandsTest.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
  * @test
  * @bug 8137167
  * @summary Randomly generates commands with random types
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
  * @build compiler.compilercontrol.mixed.RandomCommandsTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
  * @test
  * @bug 8137167
  * @summary Randomly generates valid commands with random types
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
  * @build compiler.compilercontrol.mixed.RandomValidCommandsTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/compilercontrol/parser/DirectiveParserTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/compilercontrol/parser/DirectiveParserTest.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
  * @test
  * @bug 8137167
  * @summary Tests directive json parser
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib ../share /
  * @run driver compiler.compilercontrol.parser.DirectiveParserTest
  */

--- a/hotspot/test/compiler/compilercontrol/parser/DirectiveStressTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/compilercontrol/parser/DirectiveStressTest.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
  * @test
  * @bug 8137167
  * @summary Stress directive json parser
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib ../share /
  * @run driver compiler.compilercontrol.parser.DirectiveStressTest
  */

--- a/hotspot/test/compiler/eliminateAutobox/UnsignedLoads.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/eliminateAutobox/UnsignedLoads.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary
  * @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:+EliminateAutoBox
  *                   -XX:CompileOnly=::valueOf,::byteValue,::shortValue,::testUnsignedByte,::testUnsignedShort

--- a/hotspot/test/compiler/escapeAnalysis/TestUnsafePutAddressNullObjMustNotEscape.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/escapeAnalysis/TestUnsafePutAddressNullObjMustNotEscape.java	Sun May 01 12:47:00 2016 +0300
@@ -31,7 +31,7 @@
  */
 
 import java.lang.reflect.Field;
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 public class TestUnsafePutAddressNullObjMustNotEscape {
 
@@ -43,7 +43,7 @@
         System.out.println("EXECUTING test.");
 
         {
-            System.out.println("Acquiring sun.misc.Unsafe.theUnsafe using reflection.");
+            System.out.println("Acquiring jdk.internal.misc.Unsafe.theUnsafe using reflection.");
             getUnsafe();
             System.out.println("Allocating raw memory.");
             mem = (usafe.allocateMemory(1024) + 8L) & ~7L;
@@ -78,8 +78,8 @@
     }
 
     private static void getUnsafe() throws Exception {
-        Field field = sun.misc.Unsafe.class.getDeclaredField("theUnsafe");
+        Field field = jdk.internal.misc.Unsafe.class.getDeclaredField("theUnsafe");
         field.setAccessible(true);
-        usafe = (sun.misc.Unsafe) field.get(null);
+        usafe = (jdk.internal.misc.Unsafe) field.get(null);
     }
 }

--- a/hotspot/test/compiler/floatingpoint/TestPow2.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/floatingpoint/TestPow2.java	Sun May 01 12:47:00 2016 +0300
@@ -26,6 +26,7 @@
  * @bug 8063086
  * @summary X^2 special case for C2 yields different result than interpreter
  * @library /testlibrary /test/lib /compiler/whitebox /
+ * @modules java.base/jdk.internal.misc
  * @modules java.management
  * @build TestPow2
  * @run main ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/inlining/InlineAccessors.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/inlining/InlineAccessors.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
  * @test
  * @bug 8140650
  * @summary Method::is_accessor should cover getters and setters for all types
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary
  * @run main/othervm InlineAccessors
  */

--- a/hotspot/test/compiler/intrinsics/IntrinsicAvailableTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/intrinsics/IntrinsicAvailableTest.java	Sun May 01 12:47:00 2016 +0300
@@ -29,6 +29,7 @@
 /*
  * @test
  * @bug 8130832
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib /compiler/whitebox /compiler/testlibrary /
  * @build IntrinsicAvailableTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/intrinsics/IntrinsicDisabledTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/intrinsics/IntrinsicDisabledTest.java	Sun May 01 12:47:00 2016 +0300
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 8138651
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib
  * @build IntrinsicDisabledTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/intrinsics/clone/TestObjectClone.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/intrinsics/clone/TestObjectClone.java	Sun May 01 12:47:00 2016 +0300
@@ -26,6 +26,7 @@
  * @test
  * @bug 8033626
  * @summary assert(ex_map->jvms()->same_calls_as(_exceptions->jvms())) failed: all collected exceptions must come from the same place
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary
  * @run main/othervm -XX:-TieredCompilation -Xbatch -XX:CompileOnly=TestObjectClone::f TestObjectClone
  */

--- a/hotspot/test/compiler/intrinsics/montgomerymultiply/MontgomeryMultiplyTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/intrinsics/montgomerymultiply/MontgomeryMultiplyTest.java	Sun May 01 12:47:00 2016 +0300
@@ -42,6 +42,7 @@
  * @test
  * @bug 8130150 8131779 8139907
  * @summary Verify that the Montgomery multiply and square intrinsic works and correctly checks their arguments.
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib
  * @library /testlibrary
  * @build MontgomeryMultiplyTest

--- a/hotspot/test/compiler/intrinsics/string/TestStringIntrinsicMemoryFlow.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/intrinsics/string/TestStringIntrinsicMemoryFlow.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @test
  * @bug 8144212
  * @summary Check for correct memory flow with the String compress/inflate intrinsics.
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary
  * @run main TestStringIntrinsicMemoryFlow
  */

--- a/hotspot/test/compiler/intrinsics/string/TestStringIntrinsics2.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/intrinsics/string/TestStringIntrinsics2.java	Sun May 01 12:47:00 2016 +0300
@@ -26,6 +26,7 @@
  * @test
  * @bug 8145336
  * @summary PPC64: fix string intrinsics after CompactStrings change
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib
  * @build sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/intrinsics/unsafe/HeapByteBufferTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/intrinsics/unsafe/HeapByteBufferTest.java	Sun May 01 12:47:00 2016 +0300
@@ -36,6 +36,7 @@
 /**
  * @test
  * @bug 8026049
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:-UseUnalignedAccesses -Djdk.test.lib.random.seed=0 HeapByteBufferTest
  * @run main/othervm -Djdk.test.lib.random.seed=0 HeapByteBufferTest

--- a/hotspot/test/compiler/intrinsics/unsafe/TestUnsafeMismatchedArrayFieldAccess.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/intrinsics/unsafe/TestUnsafeMismatchedArrayFieldAccess.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
 /**
  * @test
  * @bug 8142386
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib
  * @summary Unsafe access to an array is wrongly marked as mismatched
  * @run main/othervm -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:-TieredCompilation TestUnsafeMismatchedArrayFieldAccess
@@ -33,7 +34,7 @@
 
 import java.lang.reflect.*;
 import jdk.test.lib.Utils;
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 public class TestUnsafeMismatchedArrayFieldAccess {
 

--- a/hotspot/test/compiler/intrinsics/unsafe/UnsafeGetAddressTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/intrinsics/unsafe/UnsafeGetAddressTest.java	Sun May 01 12:47:00 2016 +0300
@@ -30,21 +30,21 @@
  *
  */
 
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 import java.lang.reflect.*;
 
 public class UnsafeGetAddressTest {
     private static Unsafe unsafe;
 
     public static void main(String[] args) throws Exception {
-        Class c = UnsafeGetAddressTest.class.getClassLoader().loadClass("sun.misc.Unsafe");
+        Class c = UnsafeGetAddressTest.class.getClassLoader().loadClass("jdk.internal.misc.Unsafe");
         Field f = c.getDeclaredField("theUnsafe");
         f.setAccessible(true);
         unsafe = (Unsafe)f.get(c);
 
         long address = unsafe.allocateMemory(unsafe.addressSize());
         unsafe.putAddress(address, 0x0000000080000000L);
-        // from sun.misc.Unsafe.getAddress' documentation:
+        // from jdk.internal.misc.Unsafe.getAddress' documentation:
         // "If the native pointer is less than 64 bits wide, it is
         // extended as an unsigned number to a Java long."
         result = unsafe.getAddress(address);

--- a/hotspot/test/compiler/jsr292/CallSiteDepContextTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jsr292/CallSiteDepContextTest.java	Sun May 01 12:47:00 2016 +0300
@@ -24,6 +24,7 @@
 /**
  * @test
  * @bug 8057967
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.org.objectweb.asm
  * @library patches
  * @build java.base/java.lang.invoke.MethodHandleHelper
@@ -46,7 +47,7 @@
 import java.lang.reflect.Field;
 
 import jdk.internal.org.objectweb.asm.*;
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 import static jdk.internal.org.objectweb.asm.Opcodes.*;
 

--- a/hotspot/test/compiler/jsr292/ContinuousCallSiteTargetChange.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jsr292/ContinuousCallSiteTargetChange.java	Sun May 01 12:47:00 2016 +0300
@@ -23,6 +23,7 @@
 
 /**
  * @test
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary
  * @run main ContinuousCallSiteTargetChange
  */

--- a/hotspot/test/compiler/jsr292/InvokerGC.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jsr292/InvokerGC.java	Sun May 01 12:47:00 2016 +0300
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 8067247
+ * @modules java.base/jdk.internal.misc
  * @library /test/lib /compiler/whitebox /
  * @run main/bootclasspath -Xcomp -Xbatch
  *      -XX:CompileCommand=compileonly,InvokerGC::test

--- a/hotspot/test/compiler/jsr292/MHInlineTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jsr292/MHInlineTest.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
  * @test
  * @bug 8062280
  * @summary C2: inlining failure due to access checks being too strict
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary
  * @run main/othervm MHInlineTest
  */

--- a/hotspot/test/compiler/jsr292/NonInlinedCall/GCTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jsr292/NonInlinedCall/GCTest.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
  * @test
  * @bug 8072008
  * @library /testlibrary /test/lib ../patches
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.vm.annotation
  * @build java.base/java.lang.invoke.MethodHandleHelper
  * @build sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/jsr292/NonInlinedCall/InvokeTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jsr292/NonInlinedCall/InvokeTest.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
  * @test
  * @bug 8072008
  * @library /testlibrary /test/lib / ../patches
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.vm.annotation
  * @build java.base/java.lang.invoke.MethodHandleHelper
  * @build sun.hotspot.WhiteBox

--- a/hotspot/test/compiler/jsr292/PollutedTrapCounts.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jsr292/PollutedTrapCounts.java	Sun May 01 12:47:00 2016 +0300
@@ -24,6 +24,7 @@
 /**
  * @test
  * @bug 8074551
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary
  * @run main PollutedTrapCounts
  */

--- a/hotspot/test/compiler/jsr292/VMAnonymousClasses.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jsr292/VMAnonymousClasses.java	Sun May 01 12:47:00 2016 +0300
@@ -32,7 +32,7 @@
 import jdk.internal.org.objectweb.asm.ClassWriter;
 import jdk.internal.org.objectweb.asm.MethodVisitor;
 import jdk.internal.org.objectweb.asm.Opcodes;
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 import java.lang.invoke.ConstantCallSite;
 import java.lang.invoke.MethodHandle;

--- a/hotspot/test/compiler/jvmci/JVM_GetJVMCIRuntimeTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/JVM_GetJVMCIRuntimeTest.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library /testlibrary /
+ * @modules java.base/jdk.internal.misc
  * @modules jdk.vm.ci/jdk.vm.ci.runtime
  * @run main/othervm -XX:+UnlockExperimentalVMOptions
  *      -Dcompiler.jvmci.JVM_GetJVMCIRuntimeTest.positive=true

--- a/hotspot/test/compiler/jvmci/SecurityRestrictionsTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/SecurityRestrictionsTest.java	Sun May 01 12:47:00 2016 +0300
@@ -28,6 +28,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library /testlibrary /test/lib /
  * @library common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules jdk.vm.ci/jdk.vm.ci.hotspot
  * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
  * @run main/othervm -XX:+UnlockExperimentalVMOptions

--- a/hotspot/test/compiler/jvmci/compilerToVM/AllocateCompileIdTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/AllocateCompileIdTest.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library /testlibrary /test/lib /
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.org.objectweb.asm.tree
  *          jdk.vm.ci/jdk.vm.ci.hotspot

--- a/hotspot/test/compiler/jvmci/compilerToVM/CanInlineMethodTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/CanInlineMethodTest.java	Sun May 01 12:47:00 2016 +0300
@@ -28,6 +28,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library /testlibrary /test/lib /
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.org.objectweb.asm.tree
  *          jdk.vm.ci/jdk.vm.ci.hotspot

--- a/hotspot/test/compiler/jvmci/compilerToVM/CollectCountersTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/CollectCountersTest.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library / /testlibrary /test/lib/
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules jdk.vm.ci/jdk.vm.ci.hotspot
  * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
  * @build compiler.jvmci.compilerToVM.CollectCountersTest

--- a/hotspot/test/compiler/jvmci/compilerToVM/DebugOutputTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/DebugOutputTest.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library / /testlibrary /test/lib
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules jdk.vm.ci/jdk.vm.ci.hotspot
  * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
  * @build compiler.jvmci.compilerToVM.DebugOutputTest

--- a/hotspot/test/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java	Sun May 01 12:47:00 2016 +0300
@@ -28,6 +28,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library /testlibrary /test/lib /
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.org.objectweb.asm.tree
  *          jdk.vm.ci/jdk.vm.ci.hotspot

--- a/hotspot/test/compiler/jvmci/compilerToVM/DoNotInlineOrCompileTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/DoNotInlineOrCompileTest.java	Sun May 01 12:47:00 2016 +0300
@@ -28,6 +28,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library /testlibrary /test/lib /
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.org.objectweb.asm.tree
  *          jdk.vm.ci/jdk.vm.ci.hotspot

--- a/hotspot/test/compiler/jvmci/compilerToVM/ExecuteInstalledCodeTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/ExecuteInstalledCodeTest.java	Sun May 01 12:47:00 2016 +0300
@@ -25,6 +25,7 @@
  * @library /testlibrary /test/lib /
  * @library ../common/patches
  * @ignore 8139383
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.org.objectweb.asm.tree
  *          jdk.vm.ci/jdk.vm.ci.hotspot

--- a/hotspot/test/compiler/jvmci/compilerToVM/FindUniqueConcreteMethodTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/FindUniqueConcreteMethodTest.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library / /testlibrary /test/lib
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.org.objectweb.asm.tree
  *          jdk.vm.ci/jdk.vm.ci.hotspot

--- a/hotspot/test/compiler/jvmci/compilerToVM/GetBytecodeTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/GetBytecodeTest.java	Sun May 01 12:47:00 2016 +0300
@@ -28,6 +28,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library /testlibrary /test/lib /
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.org.objectweb.asm.tree
  *          jdk.vm.ci/jdk.vm.ci.hotspot

--- a/hotspot/test/compiler/jvmci/compilerToVM/GetClassInitializerTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/GetClassInitializerTest.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library / /testlibrary /test/lib
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules jdk.vm.ci/jdk.vm.ci.hotspot
  * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
  * @build compiler.jvmci.compilerToVM.GetClassInitializerTest

--- a/hotspot/test/compiler/jvmci/compilerToVM/GetConstantPoolTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/GetConstantPoolTest.java	Sun May 01 12:47:00 2016 +0300
@@ -28,6 +28,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library /testlibrary /test/lib /
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules jdk.vm.ci/jdk.vm.ci.hotspot
  *          jdk.vm.ci/jdk.vm.ci.meta
  * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
@@ -51,7 +52,7 @@
 import jdk.vm.ci.hotspot.PublicMetaspaceWrapperObject;
 import jdk.test.lib.Utils;
 import sun.hotspot.WhiteBox;
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 /**
  * Tests for jdk.vm.ci.hotspot.CompilerToVM::getConstantPool method

--- a/hotspot/test/compiler/jvmci/compilerToVM/GetExceptionTableTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/GetExceptionTableTest.java	Sun May 01 12:47:00 2016 +0300
@@ -28,6 +28,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library /testlibrary /test/lib /
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.org.objectweb.asm.tree
  *          jdk.vm.ci/jdk.vm.ci.hotspot

--- a/hotspot/test/compiler/jvmci/compilerToVM/GetImplementorTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/GetImplementorTest.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library / /testlibrary /test/lib/
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules jdk.vm.ci/jdk.vm.ci.hotspot
  * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
  * @build compiler.jvmci.compilerToVM.GetImplementorTest

--- a/hotspot/test/compiler/jvmci/compilerToVM/GetLineNumberTableTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/GetLineNumberTableTest.java	Sun May 01 12:47:00 2016 +0300
@@ -29,6 +29,7 @@
  * @library /testlibrary /test/lib /
  * @library ../common/patches
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.org.objectweb.asm.tree
  *          jdk.vm.ci/jdk.vm.ci.hotspot

--- a/hotspot/test/compiler/jvmci/compilerToVM/GetLocalVariableTableTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/GetLocalVariableTableTest.java	Sun May 01 12:47:00 2016 +0300
@@ -28,6 +28,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library /testlibrary /test/lib /
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.org.objectweb.asm.tree
  *          jdk.vm.ci/jdk.vm.ci.hotspot

--- a/hotspot/test/compiler/jvmci/compilerToVM/GetMaxCallTargetOffsetTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/GetMaxCallTargetOffsetTest.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library / /testlibrary /test/lib/
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules jdk.vm.ci/jdk.vm.ci.hotspot
  * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
  * @build compiler.jvmci.compilerToVM.GetMaxCallTargetOffsetTest

--- a/hotspot/test/compiler/jvmci/compilerToVM/GetNextStackFrameTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/GetNextStackFrameTest.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library / /testlibrary /test/lib
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.org.objectweb.asm.tree
  *          jdk.vm.ci/jdk.vm.ci.hotspot

--- a/hotspot/test/compiler/jvmci/compilerToVM/GetResolvedJavaMethodAtSlotTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/GetResolvedJavaMethodAtSlotTest.java	Sun May 01 12:47:00 2016 +0300
@@ -28,6 +28,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library /testlibrary /test/lib /
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.org.objectweb.asm.tree
  *          jdk.vm.ci/jdk.vm.ci.hotspot

--- a/hotspot/test/compiler/jvmci/compilerToVM/GetResolvedJavaMethodTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/GetResolvedJavaMethodTest.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library / /testlibrary /test/lib
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules jdk.vm.ci/jdk.vm.ci.hotspot
  * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
  *        jdk.vm.ci/jdk.vm.ci.hotspot.PublicMetaspaceWrapperObject
@@ -48,7 +49,7 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.Utils;
 import sun.hotspot.WhiteBox;
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 import java.lang.reflect.Field;
 

--- a/hotspot/test/compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library / /testlibrary /test/lib
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules jdk.vm.ci/jdk.vm.ci.hotspot
  *          jdk.vm.ci/jdk.vm.ci.meta
  * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
@@ -59,7 +60,7 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.Utils;
 import sun.hotspot.WhiteBox;
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 public class GetResolvedJavaTypeTest {
     private static enum TestCase {

--- a/hotspot/test/compiler/jvmci/compilerToVM/GetStackTraceElementTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/GetStackTraceElementTest.java	Sun May 01 12:47:00 2016 +0300
@@ -28,6 +28,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library /testlibrary /test/lib /
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.org.objectweb.asm.tree
  *          jdk.vm.ci/jdk.vm.ci.hotspot

--- a/hotspot/test/compiler/jvmci/compilerToVM/GetSymbolTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/GetSymbolTest.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library / /testlibrary /test/lib
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.org.objectweb.asm.tree
  *          jdk.vm.ci/jdk.vm.ci.hotspot

--- a/hotspot/test/compiler/jvmci/compilerToVM/GetVtableIndexForInterfaceTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/GetVtableIndexForInterfaceTest.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library / /testlibrary /test/lib
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.org.objectweb.asm.tree
  *          jdk.vm.ci/jdk.vm.ci.hotspot

--- a/hotspot/test/compiler/jvmci/compilerToVM/HasCompiledCodeForOSRTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/HasCompiledCodeForOSRTest.java	Sun May 01 12:47:00 2016 +0300
@@ -28,6 +28,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library /testlibrary /test/lib /
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.org.objectweb.asm.tree
  *          jdk.vm.ci/jdk.vm.ci.hotspot

--- a/hotspot/test/compiler/jvmci/compilerToVM/HasFinalizableSubclassTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/HasFinalizableSubclassTest.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library / /testlibrary /test/lib
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules jdk.vm.ci/jdk.vm.ci.hotspot
  * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
  * @build compiler.jvmci.compilerToVM.HasFinalizableSubclassTest

--- a/hotspot/test/compiler/jvmci/compilerToVM/InitializeConfigurationTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/InitializeConfigurationTest.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library / /testlibrary
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules jdk.vm.ci/jdk.vm.ci.hotspot
  * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
  * @build compiler.jvmci.compilerToVM.InitializeConfigurationTest
@@ -46,7 +47,7 @@
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
 import jdk.test.lib.Asserts;
 import jdk.test.lib.Utils;
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 public class InitializeConfigurationTest {
     private static final Unsafe UNSAFE = Utils.getUnsafe();

--- a/hotspot/test/compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java	Sun May 01 12:47:00 2016 +0300
@@ -28,6 +28,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library /testlibrary /test/lib /
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.org.objectweb.asm.tree
  *          jdk.vm.ci/jdk.vm.ci.hotspot

--- a/hotspot/test/compiler/jvmci/compilerToVM/IsMatureTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/IsMatureTest.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library / /testlibrary /test/lib
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules jdk.vm.ci/jdk.vm.ci.hotspot
  * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
  * @build compiler.jvmci.compilerToVM.IsMatureTest

--- a/hotspot/test/compiler/jvmci/compilerToVM/JVM_RegisterJVMCINatives.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/JVM_RegisterJVMCINatives.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library /testlibrary /
+ * @modules java.base/jdk.internal.misc
  * @modules jdk.vm.ci/jdk.vm.ci.hotspot
  *          jdk.vm.ci/jdk.vm.ci.runtime
  * @run main/othervm -XX:+UnlockExperimentalVMOptions

--- a/hotspot/test/compiler/jvmci/compilerToVM/LookupTypeTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/LookupTypeTest.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library / /testlibrary
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules jdk.vm.ci/jdk.vm.ci.hotspot
  * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
  * @build compiler.jvmci.compilerToVM.LookupTypeTest

--- a/hotspot/test/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library / /testlibrary /test/lib
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.org.objectweb.asm.tree
  *          jdk.vm.ci/jdk.vm.ci.hotspot

--- a/hotspot/test/compiler/jvmci/compilerToVM/MethodIsIgnoredBySecurityStackWalkTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/MethodIsIgnoredBySecurityStackWalkTest.java	Sun May 01 12:47:00 2016 +0300
@@ -28,6 +28,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library /testlibrary /test/lib /
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.reflect
  *          java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.org.objectweb.asm.tree

--- a/hotspot/test/compiler/jvmci/compilerToVM/ReadUncompressedOopTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/ReadUncompressedOopTest.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library / /testlibrary /test/lib/
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules jdk.vm.ci/jdk.vm.ci.hotspot
  * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
  * @build compiler.jvmci.compilerToVM.ReadUncompressedOopTest
@@ -52,7 +53,7 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.Utils;
 import sun.hotspot.WhiteBox;
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 import java.lang.reflect.Field;
 

--- a/hotspot/test/compiler/jvmci/compilerToVM/ReprofileTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/ReprofileTest.java	Sun May 01 12:47:00 2016 +0300
@@ -28,6 +28,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library /testlibrary /test/lib /
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.org.objectweb.asm.tree
  *          jdk.vm.ci/jdk.vm.ci.hotspot

--- a/hotspot/test/compiler/jvmci/compilerToVM/ResolveFieldInPoolTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/ResolveFieldInPoolTest.java	Sun May 01 12:47:00 2016 +0300
@@ -60,7 +60,7 @@
 import jdk.vm.ci.meta.ConstantPool;
 import jdk.test.lib.Asserts;
 import jdk.test.lib.Utils;
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 /**
  * Test for {@code jdk.vm.ci.hotspot.CompilerToVM.resolveFieldInPool} method

--- a/hotspot/test/compiler/jvmci/compilerToVM/ResolveMethodTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/ResolveMethodTest.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library / /testlibrary /test/lib
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.org.objectweb.asm.tree
  *          jdk.vm.ci/jdk.vm.ci.hotspot
@@ -56,7 +57,7 @@
 import jdk.vm.ci.hotspot.HotSpotResolvedObjectType;
 import jdk.test.lib.Asserts;
 import jdk.test.lib.Utils;
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 public class ResolveMethodTest {
     private static final Unsafe UNSAFE = Utils.getUnsafe();

--- a/hotspot/test/compiler/jvmci/compilerToVM/ShouldDebugNonSafepointsTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/ShouldDebugNonSafepointsTest.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library / /testlibrary /test/lib/
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules jdk.vm.ci/jdk.vm.ci.hotspot
  * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
  * @build compiler.jvmci.compilerToVM.ShouldDebugNonSafepointsTest

--- a/hotspot/test/compiler/jvmci/compilerToVM/ShouldInlineMethodTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/compilerToVM/ShouldInlineMethodTest.java	Sun May 01 12:47:00 2016 +0300
@@ -28,6 +28,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library /testlibrary /test/lib /
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.org.objectweb.asm.tree
  *          jdk.vm.ci/jdk.vm.ci.hotspot

--- a/hotspot/test/compiler/jvmci/events/JvmciCreateMetaAccessContextTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/events/JvmciCreateMetaAccessContextTest.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library / /testlibrary
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules jdk.vm.ci/jdk.vm.ci.hotspot
  *          jdk.vm.ci/jdk.vm.ci.code
  *          jdk.vm.ci/jdk.vm.ci.meta

--- a/hotspot/test/compiler/jvmci/events/JvmciNotifyInstallEventTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/events/JvmciNotifyInstallEventTest.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library / /testlibrary
  * @library ../common/patches
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.org.objectweb.asm.tree
  *          jdk.vm.ci/jdk.vm.ci.hotspot

--- a/hotspot/test/compiler/jvmci/events/JvmciShutdownEventTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/events/JvmciShutdownEventTest.java	Sun May 01 12:47:00 2016 +0300
@@ -26,6 +26,7 @@
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library /testlibrary /
+ * @modules java.base/jdk.internal.misc
  * @modules jdk.vm.ci/jdk.vm.ci.hotspot
  *          jdk.vm.ci/jdk.vm.ci.code
  *          jdk.vm.ci/jdk.vm.ci.meta

--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/ConstantTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/ConstantTest.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @library ../../../../../
  * @modules jdk.vm.ci/jdk.vm.ci.meta
  *          jdk.vm.ci/jdk.vm.ci.runtime
+ *          java.base/jdk.internal.misc
  * @build jdk.vm.ci.runtime.test.ConstantTest
  * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.runtime.test.ConstantTest
  */

--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/RedefineClassTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/RedefineClassTest.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @library ../../../../../
  * @modules jdk.vm.ci/jdk.vm.ci.meta
  *          jdk.vm.ci/jdk.vm.ci.runtime
+ *          java.base/jdk.internal.misc
  * @build jdk.vm.ci.runtime.test.RedefineClassTest
  * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.runtime.test.RedefineClassTest
  */

--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestConstantReflectionProvider.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestConstantReflectionProvider.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @library ../../../../../
  * @modules jdk.vm.ci/jdk.vm.ci.meta
  *          jdk.vm.ci/jdk.vm.ci.runtime
+ *          java.base/jdk.internal.misc
  * @build jdk.vm.ci.runtime.test.TestConstantReflectionProvider
  * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.runtime.test.TestConstantReflectionProvider
  */

--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaField.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaField.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @library ../../../../../
  * @modules jdk.vm.ci/jdk.vm.ci.meta
  *          jdk.vm.ci/jdk.vm.ci.runtime
+ *          java.base/jdk.internal.misc
  * @build jdk.vm.ci.runtime.test.TestJavaField
  * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.runtime.test.TestJavaField
  */

--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaMethod.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaMethod.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @library ../../../../../
  * @modules jdk.vm.ci/jdk.vm.ci.meta
  *          jdk.vm.ci/jdk.vm.ci.runtime
+ *          java.base/jdk.internal.misc
  * @build jdk.vm.ci.runtime.test.TestJavaMethod
  * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.runtime.test.TestJavaMethod
  */

--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaType.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaType.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @library ../../../../../
  * @modules jdk.vm.ci/jdk.vm.ci.meta
  *          jdk.vm.ci/jdk.vm.ci.runtime
+ *          java.base/jdk.internal.misc
  * @build jdk.vm.ci.runtime.test.TestJavaType
  * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.runtime.test.TestJavaType
  */

--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestMetaAccessProvider.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestMetaAccessProvider.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @library ../../../../../
  * @modules jdk.vm.ci/jdk.vm.ci.meta
  *          jdk.vm.ci/jdk.vm.ci.runtime
+ *          java.base/jdk.internal.misc
  * @build jdk.vm.ci.runtime.test.TestMetaAccessProvider
  * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.runtime.test.TestMetaAccessProvider
  */

--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaField.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaField.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @library ../../../../../
  * @modules jdk.vm.ci/jdk.vm.ci.meta
  *          jdk.vm.ci/jdk.vm.ci.runtime
+ *          java.base/jdk.internal.misc
  * @build jdk.vm.ci.runtime.test.TestResolvedJavaField
  * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.runtime.test.TestResolvedJavaField
  */

--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @library ../../../../../
  * @modules jdk.vm.ci/jdk.vm.ci.meta
  *          jdk.vm.ci/jdk.vm.ci.runtime
+ *          java.base/jdk.internal.misc
  * @build jdk.vm.ci.runtime.test.TestResolvedJavaMethod
  * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.runtime.test.TestResolvedJavaMethod
  */

--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java	Sun May 01 12:47:00 2016 +0300
@@ -29,6 +29,7 @@
  *          jdk.vm.ci/jdk.vm.ci.meta
  *          jdk.vm.ci/jdk.vm.ci.runtime
  *          jdk.vm.ci/jdk.vm.ci.common
+ *          java.base/jdk.internal.misc
  * @build jdk.vm.ci.runtime.test.TestResolvedJavaType
  * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.runtime.test.TestResolvedJavaType
  */

--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TypeUniverse.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TypeUniverse.java	Sun May 01 12:47:00 2016 +0300
@@ -57,7 +57,7 @@
 
 import org.junit.Test;
 
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 //JaCoCo Exclude
 

--- a/hotspot/test/compiler/jvmci/meta/StableFieldTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/jvmci/meta/StableFieldTest.java	Sun May 01 12:47:00 2016 +0300
@@ -26,6 +26,7 @@
  * @bug 8151664
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library /testlibrary /test/lib /
+ * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.vm.annotation
  *          jdk.vm.ci/jdk.vm.ci.hotspot
  *          jdk.vm.ci/jdk.vm.ci.meta

--- a/hotspot/test/compiler/loopopts/UseCountedLoopSafepoints.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/loopopts/UseCountedLoopSafepoints.java	Sun May 01 12:47:00 2016 +0300
@@ -27,6 +27,7 @@
  * @bug 6869327
  * @summary Test that C2 flag UseCountedLoopSafepoints ensures a safepoint is kept in a CountedLoop
  * @library /testlibrary
+ * @modules java.base/jdk.internal.misc
  * @modules java.base
  * @ignore 8146096
  * @run main UseCountedLoopSafepoints

--- a/hotspot/test/compiler/loopopts/superword/TestVectorizationWithInvariant.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/loopopts/superword/TestVectorizationWithInvariant.java	Sun May 01 12:47:00 2016 +0300
@@ -23,12 +23,13 @@
  */
 
 import jdk.test.lib.*;
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 /**
  * @test
  * @bug 8078497
  * @summary Tests correct alignment of vectors with loop invariant offset.
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary
  * @run main TestVectorizationWithInvariant
  */

--- a/hotspot/test/compiler/onSpinWait/TestOnSpinWait.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/onSpinWait/TestOnSpinWait.java	Sun May 01 12:47:00 2016 +0300
@@ -26,6 +26,7 @@
  * @test TestOnSpinWait
  * @summary (x86 only) checks that java.lang.Thread.onSpinWait is intrinsified
  * @bug 8147844
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary
  * @requires os.arch=="x86" | os.arch=="amd64" | os.arch=="x86_64"
  * @run main TestOnSpinWait

--- a/hotspot/test/compiler/oracle/GetMethodOptionTest.java	Fri Apr 29 22:40:51 2016 -0400
+++ b/hotspot/test/compiler/oracle/GetMethodOptionTest.java	Sun May 01 12:47:00 2016 +0300
@@ -30,6 +30,7 @@
 /*
  * @test
  * @bug 8074980
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib
  * @build sun.hotspot.WhiteBox jdk.test.lib.Asserts GetMethodOptionTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox