# HG changeset patch
# User rraghavan
# Date 1565253796 -19800
# Node ID 41f2f2829a0977c4dbcd9a3a4ee4dccdf86cc333
# Parent  cafd691c6c04c53adb4597ae9c75c74a7e1bb475
8227439: Turn off AOT by default
Summary: Made UseAOT, AOTLibrary experimental and UseAOT false by default
Reviewed-by: iignatyev, kvn

diff -r cafd691c6c04 -r 41f2f2829a09 make/RunTests.gmk
--- a/make/RunTests.gmk	Thu Aug 08 03:09:46 2019 +0200
+++ b/make/RunTests.gmk	Thu Aug 08 14:13:16 2019 +0530
@@ -185,12 +185,13 @@
 	)
 	$$(call ExecuteWithLog, $$@.check, \
 	    $$(FIXPATH) $$(JDK_UNDER_TEST)/bin/java \
-	        $$($1_VM_OPTIONS) -XX:+UnlockDiagnosticVMOptions \
+	        $$($1_VM_OPTIONS) -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions \
 	        -XX:+PrintAOT -XX:+UseAOTStrictLoading \
 	        -XX:AOTLibrary=$$@ -version \
 	         > $$@.verify-aot \
 	)
 
+  $1_AOT_OPTIONS += -XX:+UnlockExperimentalVMOptions
   $1_AOT_OPTIONS += -XX:AOTLibrary=$$($1_AOT_LIB)
   $1_AOT_TARGETS += $$($1_AOT_LIB)
 endef
diff -r cafd691c6c04 -r 41f2f2829a09 make/launcher/Launcher-jdk.aot.gmk
--- a/make/launcher/Launcher-jdk.aot.gmk	Thu Aug 08 03:09:46 2019 +0200
+++ b/make/launcher/Launcher-jdk.aot.gmk	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@
         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.meta=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.runtime=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.sparc=$(call CommaList, jdk.internal.vm.compiler  jdk.aot)  \
-        -XX:+UseAOT \
+        -XX:+UnlockExperimentalVMOptions -XX:+UseAOT \
         -XX:+CalculateClassFingerprint \
         -Djvmci.UseProfilingInformation=false \
         -Dgraal.UseExceptionProbability=false \
diff -r cafd691c6c04 -r 41f2f2829a09 src/hotspot/share/runtime/globals.hpp
--- a/src/hotspot/share/runtime/globals.hpp	Thu Aug 08 03:09:46 2019 +0200
+++ b/src/hotspot/share/runtime/globals.hpp	Thu Aug 08 14:13:16 2019 +0530
@@ -1769,13 +1769,13 @@
           range(0, 100)                                                     \
                                                                             \
   /* AOT parameters */                                                      \
-  product(bool, UseAOT, AOT_ONLY(true) NOT_AOT(false),                      \
+  experimental(bool, UseAOT, false,                                         \
           "Use AOT compiled files")                                         \
                                                                             \
-  product(ccstrlist, AOTLibrary, NULL,                                      \
+  experimental(ccstrlist, AOTLibrary, NULL,                                 \
           "AOT library")                                                    \
                                                                             \
-  product(bool, PrintAOT, false,                                            \
+  experimental(bool, PrintAOT, false,                                       \
           "Print used AOT klasses and methods")                             \
                                                                             \
   notproduct(bool, PrintAOTStatistics, false,                               \
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/DeoptimizationTest.java
--- a/test/hotspot/jtreg/compiler/aot/DeoptimizationTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/DeoptimizationTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
  *     -class compiler.aot.DeoptimizationTest
  *     -compile compiler.aot.DeoptimizationTest.testMethod()D
  *     -extraopt -XX:-UseCompressedOops
- * @run main/othervm -Xmixed -XX:+UseAOT -XX:+TieredCompilation
+ * @run main/othervm -Xmixed -XX:+UnlockExperimentalVMOptions -XX:+UseAOT -XX:+TieredCompilation
  *     -XX:-UseCompressedOops
  *     -XX:CompileCommand=dontinline,compiler.aot.DeoptimizationTest::*
  *     -XX:AOTLibrary=./libDeoptimizationTest.so -Xbootclasspath/a:.
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/RecompilationTest.java
--- a/test/hotspot/jtreg/compiler/aot/RecompilationTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/RecompilationTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@
  *     -extraopt -XX:+UnlockDiagnosticVMOptions -extraopt -XX:+WhiteBoxAPI -extraopt -Xbootclasspath/a:.
  *     -extraopt -XX:-UseCompressedOops
  *     -extraopt -XX:CompileCommand=dontinline,compiler.whitebox.SimpleTestCaseHelper::*
- * @run main/othervm -Xmixed -Xbatch -XX:+UseAOT -XX:-TieredCompilation
+ * @run main/othervm -Xmixed -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT -XX:-TieredCompilation
  *     -XX:-UseCounterDecay -XX:-UseCompressedOops
  *     -XX:-Inline
  *     -XX:AOTLibrary=./libRecompilationTest2.so -Xbootclasspath/a:.
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/SharedUsageTest.java
--- a/test/hotspot/jtreg/compiler/aot/SharedUsageTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/SharedUsageTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,8 @@
  * @run driver compiler.aot.AotCompiler -libname libSharedUsageTest.so
  *      -class compiler.aot.SharedUsageTest
  *      -extraopt -XX:-UseCompressedOops
- * @run main/othervm -XX:+UseAOT -XX:AOTLibrary=./libSharedUsageTest.so
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
+ *      -XX:AOTLibrary=./libSharedUsageTest.so
  *      -XX:-UseCompressedOops
  *      -Dcompiler.aot.SharedUsageTest.parent=true
  *      compiler.aot.SharedUsageTest
@@ -62,7 +63,7 @@
                     new String[]{"libSharedUsageTest.so  aot library",
                         HELLO_MSG}, null, "Unexpected exit code",
                     "Unexpected output", ExitCode.OK, ADD_TEST_VM_OPTION,
-                    "-XX:+UseAOT", "-XX:+PrintAOT",
+                    "-XX:+UnlockExperimentalVMOptions", "-XX:+UseAOT", "-XX:+PrintAOT",
                     "-Dtest.jdk=" + Utils.TEST_JDK,
                     "-XX:AOTLibrary=./libSharedUsageTest.so",
                     SharedUsageTest.class.getName());
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,8 @@
  * @run driver 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
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
+ *      -XX:AOTLibrary=./AotInvokeDynamic2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeDynamic
  *      -checkCallerCompileLevel -1 -checkCalleeCompileLevel -1
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,12 +36,12 @@
  * @run driver compiler.aot.AotCompiler -libname AotInvokeDynamic2CompiledTest.so
  *      -class compiler.calls.common.InvokeDynamic
  *      -compile compiler.calls.common.InvokeDynamic.caller()V
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./AotInvokeDynamic2CompiledTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeDynamic -compileCallee 1
  *      -checkCalleeCompileLevel 1
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./AotInvokeDynamic2CompiledTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeDynamic -compileCallee 4
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2InterpretedTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2InterpretedTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2InterpretedTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,8 @@
  *      -libname AotInvokeDynamic2InterpretedTest.so
  *      -class compiler.calls.common.InvokeDynamic
  *      -compile compiler.calls.common.InvokeDynamic.caller()V
- * @run main/othervm -XX:AOTLibrary=./AotInvokeDynamic2InterpretedTest.so
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions
+ *      -XX:AOTLibrary=./AotInvokeDynamic2InterpretedTest.so
  *      -XX:CompileCommand=exclude,compiler.calls.common.InvokeDynamic::callee
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      -XX:+UseAOT compiler.calls.common.InvokeDynamic -checkCallerCompileLevel -1
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2NativeTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2NativeTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2NativeTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@
  * @run driver compiler.aot.AotCompiler -libname AotInvokeDynamic2NativeTest.so
  *      -class compiler.calls.common.InvokeDynamic
  *      -compile compiler.calls.common.InvokeDynamic.caller()V
- * @run main/othervm/native -XX:+UseAOT
+ * @run main/othervm/native -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *       -XX:AOTLibrary=./AotInvokeDynamic2NativeTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *       compiler.calls.common.InvokeDynamic -nativeCallee -checkCallerCompileLevel -1
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,8 @@
  * @run driver 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
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
+ *      -XX:AOTLibrary=./AotInvokeInterface2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeInterface
  *      -checkCallerCompileLevel -1 -checkCalleeCompileLevel -1
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,12 +34,12 @@
  *      -libname AotInvokeInterface2CompiledTest.so
  *      -class compiler.calls.common.InvokeInterface
  *      -compile compiler.calls.common.InvokeInterface.caller()V
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./AotInvokeInterface2CompiledTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeInterface -compileCallee 1
  *      -checkCalleeCompileLevel 1
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./AotInvokeInterface2CompiledTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeInterface -compileCallee 4
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2InterpretedTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2InterpretedTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2InterpretedTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
  *      -libname AotInvokeInterface2InterpretedTest.so
  *      -class compiler.calls.common.InvokeInterface
  *      -compile compiler.calls.common.InvokeInterface.caller()V
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./AotInvokeInterface2InterpretedTest.so
  *      -XX:CompileCommand=exclude,compiler.calls.common.InvokeInterface::callee
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2NativeTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2NativeTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2NativeTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@
  * @run driver compiler.aot.AotCompiler -libname AotInvokeInterface2NativeTest.so
  *      -class compiler.calls.common.InvokeInterface
  *      -compile compiler.calls.common.InvokeInterface.caller()V
- * @run main/othervm/native -XX:+UseAOT
+ * @run main/othervm/native -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./AotInvokeInterface2NativeTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeInterface -nativeCallee -checkCallerCompileLevel -1
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,8 @@
  * @run driver 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
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
+ *      -XX:AOTLibrary=./AotInvokeSpecial2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeSpecial
  *      -checkCallerCompileLevel -1 -checkCalleeCompileLevel -1
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,12 +33,12 @@
  * @run driver compiler.aot.AotCompiler -libname AotInvokeSpecial2CompiledTest.so
  *      -class compiler.calls.common.InvokeSpecial
  *      -compile compiler.calls.common.InvokeSpecial.caller()V
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./AotInvokeSpecial2CompiledTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeSpecial -compileCallee 1
  *      -checkCalleeCompileLevel 1
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./AotInvokeSpecial2CompiledTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeSpecial -compileCallee 4
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2InterpretedTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2InterpretedTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2InterpretedTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
  *      -libname AotInvokeSpecial2InterpretedTest.so
  *      -class compiler.calls.common.InvokeSpecial
  *      -compile compiler.calls.common.InvokeSpecial.caller()V
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./AotInvokeSpecial2InterpretedTest.so
  *      -XX:CompileCommand=exclude,compiler.calls.common.InvokeSpecial::callee
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2NativeTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2NativeTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2NativeTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@
  * @run driver compiler.aot.AotCompiler -libname AotInvokeSpecial2NativeTest.so
  *      -class compiler.calls.common.InvokeSpecial
  *      -compile compiler.calls.common.InvokeSpecial.caller()V
- * @run main/othervm/native -XX:+UseAOT
+ * @run main/othervm/native -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./AotInvokeSpecial2NativeTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeSpecial -nativeCallee -checkCallerCompileLevel -1
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,8 @@
  * @run driver 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
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
+ *      -XX:AOTLibrary=./AotInvokeStatic2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeStatic
  *      -checkCallerCompileLevel -1 -checkCalleeCompileLevel -1
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,12 +33,12 @@
  * @run driver compiler.aot.AotCompiler -libname AotInvokeStatic2CompiledTest.so
  *      -class compiler.calls.common.InvokeStatic
  *      -compile compiler.calls.common.InvokeStatic.caller()V
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./AotInvokeStatic2CompiledTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeStatic -compileCallee 1
  *      -checkCalleeCompileLevel 1
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./AotInvokeStatic2CompiledTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeStatic -compileCallee 4
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2InterpretedTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2InterpretedTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2InterpretedTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
  *      -libname AotInvokeStatic2InterpretedTest.so
  *      -class compiler.calls.common.InvokeStatic
  *      -compile compiler.calls.common.InvokeStatic.caller()V
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./AotInvokeStatic2InterpretedTest.so
  *      -XX:CompileCommand=exclude,compiler.calls.common.InvokeStatic::callee
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2NativeTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2NativeTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2NativeTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@
  * @run driver compiler.aot.AotCompiler -libname AotInvokeStatic2NativeTest.so
  *      -class compiler.calls.common.InvokeStatic
  *      -compile compiler.calls.common.InvokeStatic.caller()V
- * @run main/othervm/native -XX:+UseAOT
+ * @run main/othervm/native -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./AotInvokeStatic2NativeTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeStatic -nativeCallee -checkCallerCompileLevel -1
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,8 @@
  * @run driver 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
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
+ *      -XX:AOTLibrary=./AotInvokeVirtual2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeVirtual
  *      -checkCallerCompileLevel -1 -checkCalleeCompileLevel -1
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,12 +33,12 @@
  * @run driver compiler.aot.AotCompiler -libname AotInvokeVirtual2CompiledTest.so
  *      -class compiler.calls.common.InvokeVirtual
  *      -compile compiler.calls.common.InvokeVirtual.caller()V
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./AotInvokeVirtual2CompiledTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeVirtual -compileCallee 1
  *      -checkCalleeCompileLevel 1
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./AotInvokeVirtual2CompiledTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeVirtual -compileCallee 4
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2InterpretedTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2InterpretedTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2InterpretedTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
  *      -libname AotInvokeVirtual2InterpretedTest.so
  *      -class compiler.calls.common.InvokeVirtual
  *      -compile compiler.calls.common.InvokeVirtual.caller()V
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./AotInvokeVirtual2InterpretedTest.so
  *      -XX:CompileCommand=exclude,compiler.calls.common.InvokeVirtual::callee
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2NativeTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2NativeTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2NativeTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@
  * @run driver compiler.aot.AotCompiler -libname AotInvokeVirtual2NativeTest.so
  *      -class compiler.calls.common.InvokeVirtual
  *      -compile compiler.calls.common.InvokeVirtual.caller()V
- * @run main/othervm/native -XX:+UseAOT
+ * @run main/othervm/native -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./AotInvokeVirtual2NativeTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeVirtual -nativeCallee -checkCallerCompileLevel -1
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,12 +36,12 @@
  * @run driver compiler.aot.AotCompiler -libname CompiledInvokeDynamic2AotTest.so
  *      -class compiler.calls.common.InvokeDynamic
  *      -compile compiler.calls.common.InvokeDynamic.callee.*
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./CompiledInvokeDynamic2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeDynamic -compileCaller 1
  *      -checkCalleeCompileLevel -1 -checkCallerCompileLevel 1
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./CompiledInvokeDynamic2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeDynamic -compileCaller 4
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,12 +34,12 @@
  *      -libname CompiledInvokeInterface2AotTest.so
  *      -class compiler.calls.common.InvokeInterface
  *      -compile compiler.calls.common.InvokeInterface.callee.*
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./CompiledInvokeInterface2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeInterface -compileCaller 1
  *      -checkCalleeCompileLevel -1 -checkCallerCompileLevel 1
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./CompiledInvokeInterface2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeInterface -compileCaller 4
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,12 +33,12 @@
  * @run driver compiler.aot.AotCompiler -libname CompiledInvokeSpecial2AotTest.so
  *      -class compiler.calls.common.InvokeSpecial
  *      -compile compiler.calls.common.InvokeSpecial.callee.*
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./CompiledInvokeSpecial2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeSpecial -compileCaller 1
  *      -checkCalleeCompileLevel -1 -checkCallerCompileLevel 1
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./CompiledInvokeSpecial2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeSpecial -compileCaller 4
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,12 +33,12 @@
  * @run driver compiler.aot.AotCompiler -libname CompiledInvokeStatic2AotTest.so
  *      -class compiler.calls.common.InvokeStatic
  *      -compile compiler.calls.common.InvokeStatic.callee.*
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./CompiledInvokeStatic2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeStatic -compileCaller 1
  *      -checkCalleeCompileLevel -1 -checkCallerCompileLevel 1
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./CompiledInvokeStatic2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeStatic -compileCaller 4
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,12 +33,12 @@
  * @run driver compiler.aot.AotCompiler -libname CompiledInvokeVirtual2AotTest.so
  *      -class compiler.calls.common.InvokeVirtual
  *      -compile compiler.calls.common.InvokeVirtual.callee.*
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./CompiledInvokeVirtual2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeVirtual -compileCaller 1
  *      -checkCalleeCompileLevel -1 -checkCallerCompileLevel 1
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./CompiledInvokeVirtual2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeVirtual -compileCaller 4
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeDynamic2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeDynamic2AotTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeDynamic2AotTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@
  *      -libname InterpretedInvokeDynamic2AotTest.so
  *      -class compiler.calls.common.InvokeDynamic
  *      -compile compiler.calls.common.InvokeDynamic.callee.*
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./InterpretedInvokeDynamic2AotTest.so
  *      -XX:CompileCommand=exclude,compiler.calls.common.InvokeDynamic::caller
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeInterface2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeInterface2AotTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeInterface2AotTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
  *      -libname InterpretedInvokeInterface2AotTest.so
  *      -class compiler.calls.common.InvokeInterface
  *      -compile compiler.calls.common.InvokeInterface.callee.*
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./InterpretedInvokeInterface2AotTest.so
  *      -XX:CompileCommand=exclude,compiler.calls.common.InvokeInterface::caller
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeSpecial2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeSpecial2AotTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeSpecial2AotTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
  *      -libname InterpretedInvokeSpecial2AotTest.so
  *      -class compiler.calls.common.InvokeSpecial
  *      -compile compiler.calls.common.InvokeSpecial.callee.*
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./InterpretedInvokeSpecial2AotTest.so
  *      -XX:CompileCommand=exclude,compiler.calls.common.InvokeSpecial::caller
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeStatic2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeStatic2AotTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeStatic2AotTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
  *      -libname InterpretedInvokeStatic2AotTest.so
  *      -class compiler.calls.common.InvokeStatic
  *      -compile compiler.calls.common.InvokeStatic.callee.*
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./InterpretedInvokeStatic2AotTest.so
  *      -XX:CompileCommand=exclude,compiler.calls.common.InvokeStatic::caller
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeVirtual2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeVirtual2AotTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeVirtual2AotTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
  *      -libname InterpretedInvokeVirtual2AotTest.so
  *      -class compiler.calls.common.InvokeVirtual
  *      -compile compiler.calls.common.InvokeVirtual.callee.*
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./InterpretedInvokeVirtual2AotTest.so
  *      -XX:CompileCommand=exclude,compiler.calls.common.InvokeVirtual::caller
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeSpecial2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeSpecial2AotTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeSpecial2AotTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@
  * @run driver compiler.aot.AotCompiler -libname NativeInvokeSpecial2AotTest.so
  *      -class compiler.calls.common.InvokeSpecial
  *      -compile compiler.calls.common.InvokeSpecial.callee.*
- * @run main/othervm/native -XX:+UseAOT
+ * @run main/othervm/native -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./NativeInvokeSpecial2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeSpecial -nativeCaller -checkCalleeCompileLevel -1
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeStatic2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeStatic2AotTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeStatic2AotTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@
  * @run driver compiler.aot.AotCompiler -libname NativeInvokeStatic2AotTest.so
  *      -class compiler.calls.common.InvokeStatic
  *      -compile compiler.calls.common.InvokeStatic.callee.*
- * @run main/othervm/native -XX:+UseAOT
+ * @run main/othervm/native -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./NativeInvokeStatic2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeStatic -nativeCaller -checkCalleeCompileLevel -1
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeVirtual2AotTest.java
--- a/test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeVirtual2AotTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeVirtual2AotTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@
  * @run driver compiler.aot.AotCompiler -libname NativeInvokeVirtual2AotTest.so
  *      -class compiler.calls.common.InvokeVirtual
  *      -compile compiler.calls.common.InvokeVirtual.callee.*
- * @run main/othervm/native -XX:+UseAOT
+ * @run main/othervm/native -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  *      -XX:AOTLibrary=./NativeInvokeVirtual2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeVirtual -nativeCaller -checkCalleeCompileLevel -1
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/cli/AotLibraryNegativeBase.java
--- a/test/hotspot/jtreg/compiler/aot/cli/AotLibraryNegativeBase.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/cli/AotLibraryNegativeBase.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,8 +39,8 @@
                     UNEXPECTED_MESSAGES,
                     "Unexpected exit code using " + option,
                     "Unexpected output using " + option, ExitCode.FAIL,
-                    addTestVMOptions, "-XX:+UseAOT", "-XX:+PrintAOT",
-                    option, HelloWorldPrinter.class.getName());
+                    addTestVMOptions, "-XX:+UnlockExperimentalVMOptions", "-XX:+UseAOT",
+                    "-XX:+PrintAOT", option, HelloWorldPrinter.class.getName());
         } catch (Throwable t) {
             throw new Error("Problems executing test using " + option
                     + ": " + t, t);
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/cli/DisabledAOTWithLibraryTest.java
--- a/test/hotspot/jtreg/compiler/aot/cli/DisabledAOTWithLibraryTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/cli/DisabledAOTWithLibraryTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,7 +56,7 @@
             CommandLineOptionTest.verifyJVMStartup(EXPECTED_MESSAGES,
                     UNEXPECTED_MESSAGES, "Unexpected exit code",
                     "Unexpected output", ExitCode.OK, addTestVMOptions,
-                    "-XX:-UseAOT", "-XX:+PrintAOT",
+                    "-XX:+UnlockExperimentalVMOptions", "-XX:-UseAOT", "-XX:+PrintAOT",
                     "-XX:AOTLibrary=./" + LIB_NAME,
                     HelloWorldPrinter.class.getName());
         } catch (Throwable t) {
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/cli/MultipleAOTLibraryTest.java
--- a/test/hotspot/jtreg/compiler/aot/cli/MultipleAOTLibraryTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/cli/MultipleAOTLibraryTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -74,16 +74,17 @@
     private void runTest(String args[]) {
         try {
             boolean addTestVMOptions = true;
-            String[] allArgs = Arrays.copyOf(args, args.length + 4);
-            allArgs[args.length] = "-XX:AOTLibrary="
+            String[] allArgs = Arrays.copyOf(args, args.length + 5);
+            allArgs[args.length] = "-XX:+UnlockExperimentalVMOptions";
+            allArgs[args.length + 1] = "-XX:AOTLibrary="
                     + "." + File.separator
                     + "libMultipleAOTLibraryTest1.so"
                     + File.pathSeparator
                     + "." + File.separator
                     + "libMultipleAOTLibraryTest2.so";
-            allArgs[args.length + 1] = "-XX:+PrintAOT";
-            allArgs[args.length + 2] = "-XX:+UseAOT";
-            allArgs[args.length + 3] = HelloWorldPrinter.class.getName();
+            allArgs[args.length + 2] = "-XX:+PrintAOT";
+            allArgs[args.length + 3] = "-XX:+UseAOT";
+            allArgs[args.length + 4] = HelloWorldPrinter.class.getName();
             CommandLineOptionTest.verifyJVMStartup(EXPECTED_OUTPUT,
                     UNEXPECTED_OUTPUT, "Unexpected exit code",
                     "Unexpected output", ExitCode.OK, addTestVMOptions,
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/cli/SingleAOTLibraryTest.java
--- a/test/hotspot/jtreg/compiler/aot/cli/SingleAOTLibraryTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/cli/SingleAOTLibraryTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,8 +67,8 @@
             CommandLineOptionTest.verifyJVMStartup(EXPECTED_MESSAGES,
                     UNEXPECTED_MESSAGES, "Unexpected exit code using " + arg,
                     "Unexpected output using " + arg, ExitCode.OK,
-                    addTestVMOptions, "-XX:+UseAOT", "-XX:+PrintAOT", arg,
-                    "-XX:AOTLibrary=./libSingleAOTLibraryTest.so",
+                    addTestVMOptions, "-XX:+UnlockExperimentalVMOptions", "-XX:+UseAOT",
+                    "-XX:+PrintAOT", arg, "-XX:AOTLibrary=./libSingleAOTLibraryTest.so",
                     HelloWorldPrinter.class.getName());
         } catch (Throwable t) {
             throw new Error("Problems executing test: " + t, t);
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/cli/SingleAOTOptionTest.java
--- a/test/hotspot/jtreg/compiler/aot/cli/SingleAOTOptionTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/cli/SingleAOTOptionTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,17 +33,17 @@
  *      -compile compiler.aot.HelloWorldPrinter.print()V
  *      -extraopt -XX:+UseCompressedOops
  * @run driver compiler.aot.cli.SingleAOTOptionTest -XX:+UseCompressedOops
- *      -XX:AOTLibrary=./libSingleAOTOptionTest.so
+ *      -XX:+UnlockExperimentalVMOptions -XX:AOTLibrary=./libSingleAOTOptionTest.so
  * @run main compiler.aot.cli.SingleAOTOptionTest
- *      -XX:+UseCompressedOops -XX:+UseAOT
+ *      -XX:+UseCompressedOops -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  * @run driver compiler.aot.AotCompiler -libname libSingleAOTOptionTest.so
  *      -class compiler.aot.HelloWorldPrinter
  *      -compile compiler.aot.HelloWorldPrinter.print()V
  *      -extraopt -XX:-UseCompressedOops
  * @run driver compiler.aot.cli.SingleAOTOptionTest -XX:-UseCompressedOops
- *      -XX:AOTLibrary=./libSingleAOTOptionTest.so
+ *      -XX:+UnlockExperimentalVMOptions -XX:AOTLibrary=./libSingleAOTOptionTest.so
  * @run driver compiler.aot.cli.SingleAOTOptionTest
- *      -XX:-UseCompressedOops -XX:+UseAOT
+ *      -XX:-UseCompressedOops -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
  * @summary check if specifying only one aot option handled properly
  */
 
@@ -60,24 +60,24 @@
     private static final String[] UNEXPECTED_MESSAGES = null;
 
     public static void main(String args[]) {
-        if (args.length == 2) {
-            new SingleAOTOptionTest().runTest(args[0], args[1]);
+        if (args.length == 3) {
+            new SingleAOTOptionTest().runTest(args[0], args[1], args[2]);
         } else {
             throw new Error("Test expects 2 parameters");
         }
     }
 
-    private void runTest(String arg1, String arg2) {
+    private void runTest(String arg1, String arg2, String arg3) {
         try {
             String exitCodeErrorMessage = String.format("Unexpected exit code "
-                    + "using %s and %s", arg1, arg2);
+                    + "using %s %s %s", arg1, arg2, arg3);
             String outputErrorMessage = String.format("Unexpected output using"
-                    + " %s and %s", arg1, arg2);
+                    + " %s %s", arg1, arg2, arg3);
             boolean addTestVMOptions = true;
             CommandLineOptionTest.verifyJVMStartup(EXPECTED_MESSAGES,
                     UNEXPECTED_MESSAGES, exitCodeErrorMessage,
                     outputErrorMessage, ExitCode.OK, addTestVMOptions, arg1,
-                    arg2, HelloWorldPrinter.class.getName());
+                    arg2, arg3, HelloWorldPrinter.class.getName());
         } catch (Throwable t) {
             throw new Error("Problems executing test: " + t, t);
         }
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/cli/jaotc/JaotcTestHelper.java
--- a/test/hotspot/jtreg/compiler/aot/cli/jaotc/JaotcTestHelper.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/cli/jaotc/JaotcTestHelper.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,6 +40,7 @@
     public static final String DEFAULT_LIB_PATH = "./unnamed." + Platform.sharedLibraryExt();
     public static final String DEFAULT_LIBRARY_LOAD_MESSAGE = "loaded    " + DEFAULT_LIB_PATH
             + "  aot library";
+    private static final String UNLOCK_EXPERIMENTAL_VM_OPTIONS = "-XX:+UnlockExperimentalVMOptions";
     private static final String ENABLE_AOT = "-XX:+UseAOT";
     private static final String AOT_LIBRARY = "-XX:AOTLibrary=" + DEFAULT_LIB_PATH;
     private static final String PRINT_AOT = "-XX:+PrintAOT";
@@ -75,7 +76,8 @@
         try {
             CommandLineOptionTest.verifyJVMStartup(expectedOutput, unexpectedOutput,
                     "Unexpected exit code", "Unexpected output", ExitCode.OK,
-                    /* addTestVMOpts */ true, ENABLE_AOT, AOT_LIBRARY, PRINT_AOT, classToRun);
+                    /* addTestVMOpts */ true, UNLOCK_EXPERIMENTAL_VM_OPTIONS,
+                    ENABLE_AOT, AOT_LIBRARY, PRINT_AOT, classToRun);
         } catch (Throwable t) {
             throw new Error("Library usage verification failed: " + t, t);
         }
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/fingerprint/SelfChanged.java
--- a/test/hotspot/jtreg/compiler/aot/fingerprint/SelfChanged.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/fingerprint/SelfChanged.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,8 @@
  *
  * @run main/othervm
  *      compiler.aot.fingerprint.SelfChanged TEST-UNMODIFIED
- * @run main/othervm -XX:+UseAOT -XX:+PrintAOT -XX:AOTLibrary=./libSelfChanged.so
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT -XX:+PrintAOT
+ *      -XX:AOTLibrary=./libSelfChanged.so
  *      -Xlog:aot+class+fingerprint=trace -Xlog:aot+class+load=trace
  *      compiler.aot.fingerprint.SelfChanged TEST-UNMODIFIED
  *
@@ -46,7 +47,8 @@
  *      compiler.aot.fingerprint.SelfChanged WRITE-MODIFIED-CLASS
  * @run main
  *      compiler.aot.fingerprint.SelfChanged TEST-MODIFIED
- * @run main/othervm -XX:+UseAOT -XX:+PrintAOT -XX:AOTLibrary=./libSelfChanged.so
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT -XX:+PrintAOT
+ *      -XX:AOTLibrary=./libSelfChanged.so
  *      -Xlog:aot+class+fingerprint=trace -Xlog:aot+class+load=trace
  *      compiler.aot.fingerprint.SelfChanged TEST-MODIFIED
  */
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/fingerprint/SelfChangedCDS.java
--- a/test/hotspot/jtreg/compiler/aot/fingerprint/SelfChangedCDS.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/fingerprint/SelfChangedCDS.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,8 @@
  * @run main compiler.aot.fingerprint.CDSRunner -cp SelfChangedCDS.jar
  *      compiler.aot.fingerprint.Blah TEST-UNMODIFIED
  * @run main compiler.aot.fingerprint.CDSRunner -cp SelfChangedCDS.jar
- *      -XX:+UseAOT -XX:+PrintAOT -XX:AOTLibrary=./libSelfChanged.so
+ *      -XX:+UnlockExperimentalVMOptions -XX:+UseAOT -XX:+PrintAOT
+ *      -XX:AOTLibrary=./libSelfChanged.so
  *      -XX:SharedArchiveFile=SelfChangedCDS.jsa
  *      -XX:+IgnoreUnrecognizedVMOptions
  *      -Xshare:auto -showversion
@@ -58,7 +59,8 @@
  * @run main compiler.aot.fingerprint.CDSRunner -cp SelfChangedCDS.jar
  *      compiler.aot.fingerprint.Blah TEST-MODIFIED
  * @run main compiler.aot.fingerprint.CDSRunner -cp SelfChangedCDS.jar
- *      -XX:+UseAOT -XX:+PrintAOT -XX:AOTLibrary=./libSelfChanged.so
+ *      -XX:+UnlockExperimentalVMOptions -XX:+UseAOT -XX:+PrintAOT
+ *      -XX:AOTLibrary=./libSelfChanged.so
  *      -XX:SharedArchiveFile=SelfChangedCDS.jsa
  *      -XX:+IgnoreUnrecognizedVMOptions
  *      -Xshare:auto -showversion
@@ -77,7 +79,8 @@
  * @run main compiler.aot.fingerprint.CDSRunner -Xmx512m -cp SelfChangedCDS.jar
  *      compiler.aot.fingerprint.Blah TEST-UNMODIFIED
  * @run main compiler.aot.fingerprint.CDSRunner -Xmx512m -cp SelfChangedCDS.jar
- *      -XX:+UseAOT -XX:+PrintAOT -XX:AOTLibrary=./libSelfChanged.so
+ *      -XX:+UnlockExperimentalVMOptions -XX:+UseAOT -XX:+PrintAOT
+ *      -XX:AOTLibrary=./libSelfChanged.so
  *      -XX:SharedArchiveFile=SelfChangedCDS.jsa
  *      -XX:+IgnoreUnrecognizedVMOptions
  *      -Xshare:auto -showversion
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/fingerprint/SuperChanged.java
--- a/test/hotspot/jtreg/compiler/aot/fingerprint/SuperChanged.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/fingerprint/SuperChanged.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,8 @@
  *
  * @run main
  *      compiler.aot.fingerprint.SuperChanged TEST-UNMODIFIED
- * @run main/othervm -XX:+UseAOT -XX:+PrintAOT -XX:AOTLibrary=./libSuperChanged.so
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT -XX:+PrintAOT
+ *      -XX:AOTLibrary=./libSuperChanged.so
  *      -Xlog:aot+class+fingerprint=trace -Xlog:aot+class+load=trace
  *      compiler.aot.fingerprint.SuperChanged TEST-UNMODIFIED
   *
@@ -46,7 +47,8 @@
  *      compiler.aot.fingerprint.SuperChanged WRITE-MODIFIED-CLASS
  * @run main
  *      compiler.aot.fingerprint.SuperChanged TEST-MODIFIED
- * @run main/othervm -XX:+UseAOT -XX:+PrintAOT -XX:AOTLibrary=./libSuperChanged.so
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT -XX:+PrintAOT
+ *      -XX:AOTLibrary=./libSuperChanged.so
  *      -Xlog:aot+class+fingerprint=trace -Xlog:aot+class+load=trace
  *      compiler.aot.fingerprint.SuperChanged TEST-MODIFIED
  */
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/scripts/build-bootmodules.sh
--- a/test/hotspot/jtreg/compiler/aot/scripts/build-bootmodules.sh	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/scripts/build-bootmodules.sh	Thu Aug 08 14:13:16 2019 +0530
@@ -1,4 +1,4 @@
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@
 $JAVA_HOME/bin/javac -d . $DIR/$TEST.java
 
 JAOTC_OPTS="-J-ea -J-Xmx4g --compile-for-tiered --info"
-JAVA_OPTS="-Xmx4g -XX:+UseAOT -XX:+UnlockDiagnosticVMOptions -XX:+UseAOTStrictLoading"
+JAVA_OPTS="-Xmx4g -XX:+UnlockExperimentalVMOptions -XX:+UseAOT -XX:+UnlockDiagnosticVMOptions -XX:+UseAOTStrictLoading"
 
 # Compile with: +UseCompressedOops +UseG1GC
 LIBRARIES=""
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/scripts/test-helloworld.sh
--- a/test/hotspot/jtreg/compiler/aot/scripts/test-helloworld.sh	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/scripts/test-helloworld.sh	Thu Aug 08 14:13:16 2019 +0530
@@ -1,4 +1,4 @@
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
 OPTS="-J-Xmx4g -J-XX:-UseCompressedOops --info --verbose"
 $JAVA_HOME/bin/jaotc $OPTS --output libHelloWorld.$SO_TYPE HelloWorld.class || exit 1
 
-JAVA_OPTS="-Xmx4g -XX:-UseCompressedOops -XX:+UnlockDiagnosticVMOptions -XX:+UseAOTStrictLoading -XX:AOTLibrary=./libHelloWorld.$SO_TYPE"
+JAVA_OPTS="-Xmx4g -XX:-UseCompressedOops -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseAOTStrictLoading -XX:AOTLibrary=./libHelloWorld.$SO_TYPE"
 
 $JAVA_HOME/bin/java $JAVA_OPTS -XX:+PrintAOT -version | grep "aot library" || exit 1
 $JAVA_HOME/bin/java $JAVA_OPTS HelloWorld || exit 1
@@ -50,13 +50,13 @@
     $JAVA_HOME/bin/jaotc $OPTS --output $LIBRARY HelloWorld.class
 
     # Dump CDS archive.
-    $JAVA_HOME/bin/java -Xshare:dump -XX:-UseAOT -XX:+$gc || exit 1
+    $JAVA_HOME/bin/java -Xshare:dump -XX:+UnlockExperimentalVMOptions -XX:-UseAOT -XX:+$gc || exit 1
 
     JAVA_OPTS="-Xmx256m"
 
     echo "Tiered C1 $gc:"
     for i in `seq 1 $N`; do
-        OUT=`time $JAVA_HOME/bin/java -XX:+$gc -XX:-UseCompressedOops -XX:-UseAOT -XX:TieredStopAtLevel=1 $JAVA_OPTS HelloWorld`
+        OUT=`time $JAVA_HOME/bin/java -XX:+$gc -XX:-UseCompressedOops -XX:+UnlockExperimentalVMOptions -XX:-UseAOT -XX:TieredStopAtLevel=1 $JAVA_OPTS HelloWorld`
         if [ "$OUT" != "Hello, world!" ]; then
             echo $OUT
             exit 1
@@ -65,14 +65,14 @@
 
     echo "Tiered C1/C2 $gc:"
     for i in `seq 1 $N`; do
-        OUT=`time $JAVA_HOME/bin/java -XX:+$gc -XX:-UseCompressedOops -XX:-UseAOT $JAVA_OPTS HelloWorld`
+        OUT=`time $JAVA_HOME/bin/java -XX:+$gc -XX:-UseCompressedOops -XX:+UnlockExperimentalVMOptions -XX:-UseAOT $JAVA_OPTS HelloWorld`
         if [ "$OUT" != "Hello, world!" ]; then
             echo $OUT
             exit 1
         fi
     done
 
-    JAVA_OPTS="-Xmx256m -XX:+UseCompressedOops -XX:+UnlockDiagnosticVMOptions -XX:+UseAOTStrictLoading -XX:AOTLibrary=./$LIBRARY"
+    JAVA_OPTS="-Xmx256m -XX:+UseCompressedOops -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseAOTStrictLoading -XX:AOTLibrary=./$LIBRARY"
 
 
     echo "AOT $gc:"
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/scripts/test-jaotc.sh
--- a/test/hotspot/jtreg/compiler/aot/scripts/test-jaotc.sh	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/scripts/test-jaotc.sh	Thu Aug 08 14:13:16 2019 +0530
@@ -1,4 +1,4 @@
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,6 @@
 
 $JAVA_HOME/bin/javac -d . $DIR/HelloWorld.java
 
-$JAVA_HOME/bin/java -XX:-UseCompressedOops -XX:AOTLibrary=./libjava.base-aot.$SO_TYPE HelloWorld
+$JAVA_HOME/bin/java -XX:-UseCompressedOops -XX:+UnlockExperimentalVMOptions -XX:AOTLibrary=./libjava.base-aot.$SO_TYPE HelloWorld
 
 rm -f HelloWorld.class libjdk.aot.$SO_TYPE libjava.base-aot.$SO_TYPE
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/scripts/test-javac.sh
--- a/test/hotspot/jtreg/compiler/aot/scripts/test-javac.sh	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/scripts/test-javac.sh	Thu Aug 08 14:13:16 2019 +0530
@@ -1,4 +1,4 @@
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 DIR=`pwd`
 popd > /dev/null
 
-AOT_OPTS="-XX:+UseAOT"
+AOT_OPTS="-XX:+UnlockExperimentalVMOptions -XX:+UseAOT"
 
 $JAVA_HOME/bin/java $AOT_OPTS -XX:+PrintAOT -version | grep "aot library" || exit 1
 
@@ -64,7 +64,7 @@
 
 echo "Tiered C1:"
 for i in `seq 1 $N`; do
-    time $JAVA_HOME/bin/java $JAVA_OPTS -XX:-UseAOT -XX:TieredStopAtLevel=1 $APP $FILE.java
+    time $JAVA_HOME/bin/java $JAVA_OPTS -XX:+UnlockExperimentalVMOptions -XX:-UseAOT -XX:TieredStopAtLevel=1 $APP $FILE.java
     if [ $? -ne 0 ]; then
         exit 1
     fi
@@ -73,7 +73,7 @@
 
 echo "Tiered C1/C2:"
 for i in `seq 1 $N`; do
-    time $JAVA_HOME/bin/java $JAVA_OPTS -XX:-UseAOT $APP $FILE.java
+    time $JAVA_HOME/bin/java $JAVA_OPTS -XX:+UnlockExperimentalVMOptions -XX:-UseAOT $APP $FILE.java
     if [ $? -ne 0 ]; then
         exit 1
     fi
@@ -82,7 +82,7 @@
 
 echo "Tiered C1/C2 -Xshare:on:"
 for i in `seq 1 $N`; do
-    time $JAVA_HOME/bin/java $JAVA_OPTS -XX:-UseAOT -Xshare:on $APP $FILE.java
+    time $JAVA_HOME/bin/java $JAVA_OPTS -XX:+UnlockExperimentalVMOptions -XX:-UseAOT -Xshare:on $APP $FILE.java
     if [ $? -ne 0 ]; then
         exit 1
     fi
@@ -117,7 +117,7 @@
 echo "Tiered C1 (compiling $NAME: $COUNT classes):"
 for i in `seq 1 $N`; do
     mkdir tmp
-    time $JAVA_HOME/bin/javac -J-XX:-UseAOT -J-XX:TieredStopAtLevel=1 -XDignore.symbol.file -d tmp $FILES
+    time $JAVA_HOME/bin/javac -J-XX:+UnlockExperimentalVMOptions -J-XX:-UseAOT -J-XX:TieredStopAtLevel=1 -XDignore.symbol.file -d tmp $FILES
     if [ $? -ne 0 ]; then
         exit 1
     fi
@@ -127,7 +127,7 @@
 echo "Tiered C1/C2 (compiling $NAME: $COUNT classes):"
 for i in `seq 1 $N`; do
     mkdir tmp
-    time $JAVA_HOME/bin/javac -J-XX:-UseAOT -XDignore.symbol.file -cp /java/devtools/share/junit/latest/junit.jar -d tmp $FILES
+    time $JAVA_HOME/bin/javac -J-XX:+UnlockExperimentalVMOptions -J-XX:-UseAOT -XDignore.symbol.file -cp /java/devtools/share/junit/latest/junit.jar -d tmp $FILES
     if [ $? -ne 0 ]; then
         exit 1
     fi
@@ -137,7 +137,7 @@
 echo "Tiered AOT (compiling $NAME: $COUNT classes):"
 for i in `seq 1 $N`; do
     mkdir tmp
-    time $JAVA_HOME/bin/javac -J-XX:+UseAOT -XDignore.symbol.file -cp /java/devtools/share/junit/latest/junit.jar -d tmp $FILES
+    time $JAVA_HOME/bin/javac -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseAOT -XDignore.symbol.file -cp /java/devtools/share/junit/latest/junit.jar -d tmp $FILES
     if [ $? -ne 0 ]; then
         exit 1
     fi
@@ -147,7 +147,7 @@
 echo "Tiered AOT -Xshare:on (compiling $NAME: $COUNT classes):"
 for i in `seq 1 $N`; do
     mkdir tmp
-    time $JAVA_HOME/bin/javac -J-Xshare:on -J-XX:+UseAOT -XDignore.symbol.file -cp /java/devtools/share/junit/latest/junit.jar -d tmp $FILES
+    time $JAVA_HOME/bin/javac -J-Xshare:on -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseAOT -XDignore.symbol.file -cp /java/devtools/share/junit/latest/junit.jar -d tmp $FILES
     if [ $? -ne 0 ]; then
         exit 1
     fi
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/scripts/test-nashorn.sh
--- a/test/hotspot/jtreg/compiler/aot/scripts/test-nashorn.sh	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/scripts/test-nashorn.sh	Thu Aug 08 14:13:16 2019 +0530
@@ -1,4 +1,4 @@
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 # set env variables
 . $DIR/test-env.sh
 
-$JAVA_HOME/bin/java -XX:+UnlockDiagnosticVMOptions -XX:+UseAOTStrictLoading -XX:+PrintAOT -version | grep "aot library" || exit 1
+$JAVA_HOME/bin/java -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseAOTStrictLoading -XX:+PrintAOT -version | grep "aot library" || exit 1
 
 # Dump CDS archive.
 $JAVA_HOME/bin/java -Xshare:dump || exit 1
@@ -41,7 +41,7 @@
 
 echo "Tiered C1:"
 for i in `seq 1 $N`; do
-    time $JAVA_HOME/bin/jjs $JAVA_OPTS -J-XX:-UseAOT -J-XX:TieredStopAtLevel=1 $FILE
+    time $JAVA_HOME/bin/jjs $JAVA_OPTS -J-XX:+UnlockExperimentalVMOptions -J-XX:-UseAOT -J-XX:TieredStopAtLevel=1 $FILE
     if [ $? -ne 0 ]; then
         exit 1
     fi
@@ -49,7 +49,7 @@
 
 echo "Tiered C1/C2:"
 for i in `seq 1 $N`; do
-    time $JAVA_HOME/bin/jjs $JAVA_OPTS -J-XX:-UseAOT $FILE
+    time $JAVA_HOME/bin/jjs $JAVA_OPTS -J-XX:+UnlockExperimentalVMOptions -J-XX:-UseAOT $FILE
     if [ $? -ne 0 ]; then
         exit 1
     fi
@@ -57,7 +57,7 @@
 
 echo "Tiered AOT:"
 for i in `seq 1 $N`; do
-    time $JAVA_HOME/bin/jjs $JAVA_OPTS -J-XX:+UnlockDiagnosticVMOptions -J-XX:+UseAOTStrictLoading -J-XX:AOTLibrary=./libjdk.nashorn.$SO_TYPE $FILE
+    time $JAVA_HOME/bin/jjs $JAVA_OPTS -J-XX:+UnlockDiagnosticVMOptions -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseAOTStrictLoading -J-XX:AOTLibrary=./libjdk.nashorn.$SO_TYPE $FILE
     if [ $? -ne 0 ]; then
         exit 1
     fi
@@ -65,7 +65,7 @@
 
 echo "Tiered AOT -Xshare:on:"
 for i in `seq 1 $N`; do
-    time $JAVA_HOME/bin/jjs $JAVA_OPTS -J-Xshare:on -J-XX:+UnlockDiagnosticVMOptions -J-XX:+UseAOTStrictLoading -J-XX:AOTLibrary=./libjdk.nashorn.$SO_TYPE $FILE
+    time $JAVA_HOME/bin/jjs $JAVA_OPTS -J-Xshare:on -J-XX:+UnlockDiagnosticVMOptions -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseAOTStrictLoading -J-XX:AOTLibrary=./libjdk.nashorn.$SO_TYPE $FILE
     if [ $? -ne 0 ]; then
         exit 1
     fi
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/verification/ClassAndLibraryNotMatchTest.java
--- a/test/hotspot/jtreg/compiler/aot/verification/ClassAndLibraryNotMatchTest.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/verification/ClassAndLibraryNotMatchTest.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -93,8 +93,8 @@
         ProcessBuilder pb;
         try {
             pb = ProcessTools.createJavaProcessBuilder(true, "-cp", ".",
-                    "-XX:+UseAOT", "-XX:AOTLibrary=./" + LIB_NAME,
-                    HELLO_WORLD_CLASS_NAME);
+                    "-XX:+UnlockExperimentalVMOptions", "-XX:+UseAOT",
+                    "-XX:AOTLibrary=./" + LIB_NAME, HELLO_WORLD_CLASS_NAME);
         } catch (Exception e) {
             throw new Error("Can't create ProcessBuilder to run "
                     + HELLO_WORLD_CLASS_NAME + " " + e, e);
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/compiler/aot/verification/vmflags/BasicFlagsChange.java
--- a/test/hotspot/jtreg/compiler/aot/verification/vmflags/BasicFlagsChange.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/compiler/aot/verification/vmflags/BasicFlagsChange.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -87,8 +87,8 @@
                so, a message like "skipped $pathTolibrary aot library" or
                "loaded    $pathToLibrary  aot library" is present for cases of
                incompatible or compatible flags respectively */
-            pb = ProcessTools.createJavaProcessBuilder(true, "-XX:+UseAOT",
-                    "-XX:+PrintAOT", "-XX:AOTLibrary=./" + libName, option,
+            pb = ProcessTools.createJavaProcessBuilder(true, "-XX:+UnlockExperimentalVMOptions",
+                    "-XX:+UseAOT", "-XX:+PrintAOT", "-XX:AOTLibrary=./" + libName, option,
                     HelloWorldPrinter.class.getName());
         } catch (Exception ex) {
             throw new Error("Problems creating ProcessBuilder using " + option
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointers.java
--- a/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointers.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointers.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,6 +70,7 @@
     public static void largeHeapTest() throws Exception {
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
             "-XX:+UnlockDiagnosticVMOptions",
+            "-XX:+UnlockExperimentalVMOptions",
             "-Xmx30g",
             "-XX:-UseAOT", // AOT explicitly set klass shift to 3.
             "-Xlog:gc+metaspace=trace",
diff -r cafd691c6c04 -r 41f2f2829a09 test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/AotTestGeneratorsFactory.java
--- a/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/AotTestGeneratorsFactory.java	Thu Aug 08 03:09:46 2019 +0200
+++ b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/AotTestGeneratorsFactory.java	Thu Aug 08 14:13:16 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,8 @@
 import java.util.function.Function;
 
 public class AotTestGeneratorsFactory implements Function<String[], List<TestsGenerator>> {
-    private static final String AOT_OPTIONS = "-XX:+UseAOT -XX:AOTLibrary=./aottest.so";
+    private static final String AOT_OPTIONS
+            = "-XX:+UnlockExperimentalVMOptions -XX:+UseAOT -XX:AOTLibrary=./aottest.so";
     private static final String AOT_COMPILER_BUILD_ACTION
             = "@build compiler.aot.AotCompiler";
     private static final String AOT_COMPILER_RUN_ACTION_PREFIX