# HG changeset patch
# User iignatyev
# Date 1572973056 28800
# Node ID ba99c5a4491de774ac2c10fa8f84b62087861cc3
# Parent  f4b1addb974234ae985636d958947fd698cd63f9
8233496: AOT tests failures with 'java.lang.RuntimeException: Failed to find sun/hotspot/WhiteBox.class'
Reviewed-by: kvn, thartmann

diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/DeoptimizationTest.java
--- a/test/hotspot/jtreg/compiler/aot/DeoptimizationTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/DeoptimizationTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -27,7 +27,7 @@
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @build compiler.aot.DeoptimizationTest
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *     sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.aot.AotCompiler -libname libDeoptimizationTest.so
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/RecompilationTest.java
--- a/test/hotspot/jtreg/compiler/aot/RecompilationTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/RecompilationTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -27,7 +27,7 @@
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @build compiler.aot.RecompilationTest
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *     sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.aot.AotCompiler -libname libRecompilationTest1.so
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -28,8 +28,7 @@
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeDynamic
- *        compiler.calls.common.InvokeDynamicPatcher
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver compiler.calls.common.InvokeDynamicPatcher
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -28,8 +28,7 @@
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeDynamic
- *        compiler.calls.common.InvokeDynamicPatcher
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver compiler.calls.common.InvokeDynamicPatcher
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2InterpretedTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2InterpretedTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2InterpretedTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -28,8 +28,7 @@
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeDynamic
- *        compiler.calls.common.InvokeDynamicPatcher
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver compiler.calls.common.InvokeDynamicPatcher
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2NativeTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2NativeTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2NativeTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -28,8 +28,7 @@
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeDynamic
- *        compiler.calls.common.InvokeDynamicPatcher
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver compiler.calls.common.InvokeDynamicPatcher
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -27,7 +27,7 @@
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeInterface
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.aot.AotCompiler -libname AotInvokeInterface2AotTest.so
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -27,7 +27,7 @@
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeInterface
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.aot.AotCompiler
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2InterpretedTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2InterpretedTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2InterpretedTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -27,7 +27,7 @@
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeInterface
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.aot.AotCompiler
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2NativeTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2NativeTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2NativeTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -27,7 +27,7 @@
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeInterface
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.aot.AotCompiler -libname AotInvokeInterface2NativeTest.so
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -27,7 +27,7 @@
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeSpecial
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.aot.AotCompiler -libname AotInvokeSpecial2AotTest.so
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -27,7 +27,7 @@
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeSpecial
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.aot.AotCompiler -libname AotInvokeSpecial2CompiledTest.so
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2InterpretedTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2InterpretedTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2InterpretedTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -27,7 +27,7 @@
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeSpecial
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.aot.AotCompiler
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2NativeTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2NativeTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2NativeTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -27,7 +27,7 @@
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeSpecial
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.aot.AotCompiler -libname AotInvokeSpecial2NativeTest.so
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -27,7 +27,7 @@
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeStatic
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.aot.AotCompiler -libname AotInvokeStatic2AotTest.so
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -27,7 +27,7 @@
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeStatic
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.aot.AotCompiler -libname AotInvokeStatic2CompiledTest.so
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2InterpretedTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2InterpretedTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2InterpretedTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -27,7 +27,7 @@
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeStatic
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.aot.AotCompiler
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2NativeTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2NativeTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2NativeTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -27,7 +27,7 @@
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeStatic
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.aot.AotCompiler -libname AotInvokeStatic2NativeTest.so
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -27,7 +27,7 @@
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeVirtual
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.aot.AotCompiler -libname AotInvokeVirtual2AotTest.so
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -27,7 +27,7 @@
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeVirtual
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.aot.AotCompiler -libname AotInvokeVirtual2CompiledTest.so
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2InterpretedTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2InterpretedTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2InterpretedTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -27,7 +27,7 @@
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeVirtual
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.aot.AotCompiler
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2NativeTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2NativeTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2NativeTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -27,7 +27,7 @@
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeVirtual
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.aot.AotCompiler -libname AotInvokeVirtual2NativeTest.so
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -28,8 +28,7 @@
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeDynamic
- *        compiler.calls.common.InvokeDynamicPatcher
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.calls.common.InvokeDynamicPatcher
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -27,7 +27,7 @@
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeInterface
- *      compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.aot.AotCompiler
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -27,7 +27,7 @@
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeSpecial
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.aot.AotCompiler -libname CompiledInvokeSpecial2AotTest.so
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -27,7 +27,7 @@
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeStatic
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.aot.AotCompiler -libname CompiledInvokeStatic2AotTest.so
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -27,7 +27,7 @@
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeVirtual
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.aot.AotCompiler -libname CompiledInvokeVirtual2AotTest.so
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeDynamic2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeDynamic2AotTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeDynamic2AotTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -28,8 +28,7 @@
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeDynamic
- *        compiler.calls.common.InvokeDynamicPatcher
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.calls.common.InvokeDynamicPatcher
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeInterface2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeInterface2AotTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeInterface2AotTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -27,7 +27,7 @@
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeInterface
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.aot.AotCompiler
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeSpecial2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeSpecial2AotTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeSpecial2AotTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -27,7 +27,7 @@
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeSpecial
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.aot.AotCompiler
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeStatic2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeStatic2AotTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeStatic2AotTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -27,7 +27,7 @@
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeStatic
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.aot.AotCompiler
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeVirtual2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeVirtual2AotTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeVirtual2AotTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -27,7 +27,7 @@
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeVirtual
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.aot.AotCompiler
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeSpecial2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeSpecial2AotTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeSpecial2AotTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -27,7 +27,7 @@
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeSpecial
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.aot.AotCompiler -libname NativeInvokeSpecial2AotTest.so
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeStatic2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeStatic2AotTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeStatic2AotTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -27,7 +27,7 @@
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeStatic
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.aot.AotCompiler -libname NativeInvokeStatic2AotTest.so
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeVirtual2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeVirtual2AotTest.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeVirtual2AotTest.java	Tue Nov 05 08:57:36 2019 -0800
@@ -27,7 +27,7 @@
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeVirtual
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.aot.AotCompiler -libname NativeInvokeVirtual2AotTest.so
diff -r f4b1addb9742 -r ba99c5a4491d test/hotspot/jtreg/compiler/aot/fingerprint/SelfChangedCDS.java
--- a/test/hotspot/jtreg/compiler/aot/fingerprint/SelfChangedCDS.java	Tue Nov 05 17:27:18 2019 +0100
+++ b/test/hotspot/jtreg/compiler/aot/fingerprint/SelfChangedCDS.java	Tue Nov 05 08:57:36 2019 -0800
@@ -29,7 +29,7 @@
  *          java.management
  * @requires vm.aot & vm.cds
  * @build compiler.aot.fingerprint.SelfChanged
- *        compiler.aot.AotCompiler
+ *        sun.hotspot.WhiteBox
  *
  * @run main compiler.aot.fingerprint.SelfChanged WRITE-UNMODIFIED-CLASS
  * @run driver compiler.aot.AotCompiler -libname libSelfChanged.so