--- old/test/compiler/jvmci/compilerToVM/ExecuteInstalledCodeTest.java 2017-02-15 16:54:58.970100832 -0800 +++ new/test/compiler/jvmci/compilerToVM/ExecuteInstalledCodeTest.java 2017-02-15 16:54:58.873096565 -0800 @@ -21,21 +21,6 @@ * questions. */ -package compiler.jvmci.compilerToVM; - -import jdk.test.lib.Asserts; -import jdk.test.lib.util.Pair; -import jdk.test.lib.Utils; -import jdk.vm.ci.code.InstalledCode; -import jdk.vm.ci.code.InvalidInstalledCodeException; -import jdk.vm.ci.hotspot.CompilerToVMHelper; -import sun.hotspot.code.NMethod; - -import java.lang.reflect.Constructor; -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.List; - /* * @test * @bug 8136421 @@ -45,9 +30,9 @@ * @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 - * jdk.vm.ci/jdk.vm.ci.code - * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox + * jdk.internal.vm.ci/jdk.vm.ci.hotspot + * jdk.internal.vm.ci/jdk.vm.ci.code + * @build jdk.internal.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. @@ -56,6 +41,21 @@ * compiler.jvmci.compilerToVM.ExecuteInstalledCodeTest */ +package compiler.jvmci.compilerToVM; + +import jdk.test.lib.Asserts; +import jdk.test.lib.util.Pair; +import jdk.test.lib.Utils; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.code.InvalidInstalledCodeException; +import jdk.vm.ci.hotspot.CompilerToVMHelper; +import sun.hotspot.code.NMethod; + +import java.lang.reflect.Constructor; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.List; + public class ExecuteInstalledCodeTest { public static void main(String[] args) {