--- old/test/compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java	2016-12-12 18:31:16.717713155 +0300
+++ new/test/compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java	2016-12-12 18:31:16.653713157 +0300
@@ -36,6 +36,7 @@
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler -libname AotInvokeDynamic2AotTest.so
  *      -class compiler.calls.common.InvokeDynamic
+ *      -extraopt -XX:+UnlockDiagnosticVMOptions -extraopt -XX:+WhiteBoxAPI -extraopt -Xbootclasspath/a:.
  * @run main/othervm -XX:+UseAOT -XX:AOTLibrary=./AotInvokeDynamic2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeDynamic
--- old/test/compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java	2016-12-12 18:31:16.937713150 +0300
+++ new/test/compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java	2016-12-12 18:31:16.873713151 +0300
@@ -32,6 +32,7 @@
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler -libname AotInvokeInterface2AotTest.so
  *      -class compiler.calls.common.InvokeInterface
+ *      -extraopt -XX:+UnlockDiagnosticVMOptions -extraopt -XX:+WhiteBoxAPI -extraopt -Xbootclasspath/a:.
  * @run main/othervm -XX:+UseAOT -XX:AOTLibrary=./AotInvokeInterface2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeInterface
--- old/test/compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java	2016-12-12 18:31:17.161713144 +0300
+++ new/test/compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java	2016-12-12 18:31:17.097713146 +0300
@@ -32,6 +32,7 @@
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler -libname AotInvokeSpecial2AotTest.so
  *      -class compiler.calls.common.InvokeSpecial
+ *      -extraopt -XX:+UnlockDiagnosticVMOptions -extraopt -XX:+WhiteBoxAPI -extraopt -Xbootclasspath/a:.
  * @run main/othervm -XX:+UseAOT -XX:AOTLibrary=./AotInvokeSpecial2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeSpecial
--- old/test/compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java	2016-12-12 18:31:17.393713138 +0300
+++ new/test/compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java	2016-12-12 18:31:17.325713140 +0300
@@ -32,6 +32,7 @@
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler -libname AotInvokeStatic2AotTest.so
  *      -class compiler.calls.common.InvokeStatic
+ *      -extraopt -XX:+UnlockDiagnosticVMOptions -extraopt -XX:+WhiteBoxAPI -extraopt -Xbootclasspath/a:.
  * @run main/othervm -XX:+UseAOT -XX:AOTLibrary=./AotInvokeStatic2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeStatic
--- old/test/compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java	2016-12-12 18:31:17.617713132 +0300
+++ new/test/compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java	2016-12-12 18:31:17.553713134 +0300
@@ -32,6 +32,7 @@
  *      sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main compiler.aot.AotCompiler -libname AotInvokeVirtual2AotTest.so
  *      -class compiler.calls.common.InvokeVirtual
+ *      -extraopt -XX:+UnlockDiagnosticVMOptions -extraopt -XX:+WhiteBoxAPI -extraopt -Xbootclasspath/a:.
  * @run main/othervm -XX:+UseAOT -XX:AOTLibrary=./AotInvokeVirtual2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeVirtual