changeset 61055:b3dd6ce46afa vectorIntrinsics

manual merge with default
author sviswanathan
date Mon, 04 May 2020 16:53:49 -0700
parents 9bf7c2805d08 b9029734989a
children d18a6e1e0753 f59aa5ebd359
files make/common/SetupJavaCompilers.gmk make/copy/Copy-java.base.gmk make/copy/Copy-java.desktop.gmk make/copy/Copy-java.logging.gmk make/copy/Copy-jdk.accessibility.gmk make/copy/Copy-jdk.crypto.cryptoki.gmk make/copy/Copy-jdk.crypto.ucrypto.gmk make/copy/Copy-jdk.jdwp.agent.gmk make/copy/Copy-jdk.jfr.gmk make/copy/Copy-jdk.management.agent.gmk make/copy/CopyCommon.gmk make/data/cacerts/addtrustclass1ca make/data/cacerts/keynectisrootca make/gendata/Gendata-java.base.gmk make/gendata/Gendata-java.desktop.gmk make/gendata/Gendata-jdk.compiler.gmk make/gendata/GendataBlacklistedCerts.gmk make/gendata/GendataBreakIterator.gmk make/gendata/GendataCommon.gmk make/gendata/GendataCryptoPolicy.gmk make/gendata/GendataFontConfig.gmk make/gendata/GendataHtml32dtd.gmk make/gendata/GendataPublicSuffixList.gmk make/gendata/GendataTZDB.gmk make/gensrc/Gensrc-java.base.gmk make/gensrc/Gensrc-java.desktop.gmk make/gensrc/Gensrc-java.logging.gmk make/gensrc/Gensrc-jdk.charsets.gmk make/gensrc/Gensrc-jdk.compiler.gmk make/gensrc/Gensrc-jdk.hotspot.agent.gmk make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk make/gensrc/Gensrc-jdk.internal.vm.compiler.management.gmk make/gensrc/Gensrc-jdk.jartool.gmk make/gensrc/Gensrc-jdk.javadoc.gmk make/gensrc/Gensrc-jdk.jdeps.gmk make/gensrc/Gensrc-jdk.jdi.gmk make/gensrc/Gensrc-jdk.jlink.gmk make/gensrc/Gensrc-jdk.jshell.gmk make/gensrc/Gensrc-jdk.localedata.gmk make/gensrc/Gensrc-jdk.management.agent.gmk make/gensrc/GensrcBuffer.gmk make/gensrc/GensrcCharacterData.gmk make/gensrc/GensrcCharsetCoder.gmk make/gensrc/GensrcCharsetMapping.gmk make/gensrc/GensrcCommonJdk.gmk make/gensrc/GensrcCommonLangtools.gmk make/gensrc/GensrcEmojiData.gmk make/gensrc/GensrcExceptions.gmk make/gensrc/GensrcIcons.gmk make/gensrc/GensrcLocaleData.gmk make/gensrc/GensrcMisc.gmk make/gensrc/GensrcModuleInfo.gmk make/gensrc/GensrcModuleLoaderMap.gmk make/gensrc/GensrcProperties.gmk make/gensrc/GensrcSwing.gmk make/gensrc/GensrcVarHandles.gmk make/gensrc/GensrcX11Wrappers.gmk make/launcher/Launcher-java.base.gmk make/launcher/Launcher-java.rmi.gmk make/launcher/Launcher-java.scripting.gmk make/launcher/Launcher-java.security.jgss.gmk make/launcher/Launcher-jdk.accessibility.gmk make/launcher/Launcher-jdk.aot.gmk make/launcher/Launcher-jdk.compiler.gmk make/launcher/Launcher-jdk.hotspot.agent.gmk make/launcher/Launcher-jdk.incubator.jpackage.gmk make/launcher/Launcher-jdk.jartool.gmk make/launcher/Launcher-jdk.javadoc.gmk make/launcher/Launcher-jdk.jcmd.gmk make/launcher/Launcher-jdk.jconsole.gmk make/launcher/Launcher-jdk.jdeps.gmk make/launcher/Launcher-jdk.jdi.gmk make/launcher/Launcher-jdk.jfr.gmk make/launcher/Launcher-jdk.jlink.gmk make/launcher/Launcher-jdk.jshell.gmk make/launcher/Launcher-jdk.jstatd.gmk make/launcher/LauncherCommon.gmk make/lib/Awt2dLibraries.gmk make/lib/CoreLibraries.gmk make/lib/Lib-java.base.gmk make/lib/Lib-java.desktop.gmk make/lib/Lib-java.instrument.gmk make/lib/Lib-java.management.gmk make/lib/Lib-java.prefs.gmk make/lib/Lib-java.rmi.gmk make/lib/Lib-java.security.jgss.gmk make/lib/Lib-java.smartcardio.gmk make/lib/Lib-jdk.accessibility.gmk make/lib/Lib-jdk.attach.gmk make/lib/Lib-jdk.crypto.cryptoki.gmk make/lib/Lib-jdk.crypto.ec.gmk make/lib/Lib-jdk.crypto.mscapi.gmk make/lib/Lib-jdk.crypto.ucrypto.gmk make/lib/Lib-jdk.hotspot.agent.gmk make/lib/Lib-jdk.incubator.jpackage.gmk make/lib/Lib-jdk.internal.le.gmk make/lib/Lib-jdk.jdi.gmk make/lib/Lib-jdk.jdwp.agent.gmk make/lib/Lib-jdk.management.agent.gmk make/lib/Lib-jdk.management.gmk make/lib/Lib-jdk.net.gmk make/lib/Lib-jdk.sctp.gmk make/lib/Lib-jdk.security.auth.gmk make/lib/LibCommon.gmk src/hotspot/cpu/aarch64/aarch64.ad src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp src/hotspot/cpu/aarch64/stubRoutines_aarch64.cpp src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp src/hotspot/cpu/arm/arm.ad src/hotspot/cpu/ppc/ppc.ad src/hotspot/cpu/s390/s390.ad src/hotspot/cpu/sparc/sparc.ad src/hotspot/cpu/x86/x86_32.ad src/hotspot/cpu/x86/x86_64.ad src/hotspot/share/classfile/systemDictionary.hpp src/hotspot/share/classfile/vmSymbols.hpp src/hotspot/share/jvmci/vmStructs_jvmci.cpp src/hotspot/share/opto/castnode.cpp src/hotspot/share/opto/cfgnode.cpp src/hotspot/share/opto/classes.hpp src/hotspot/share/opto/compile.cpp src/hotspot/share/opto/graphKit.cpp src/hotspot/share/opto/node.hpp src/hotspot/share/runtime/arguments.cpp src/hotspot/share/runtime/globals.hpp src/hotspot/share/runtime/vmStructs.cpp src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM834.java src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM949C.java src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VMOps.java src/jdk.incubator.jpackage/linux/native/jpackageapplauncher/launcher.cpp src/jdk.incubator.jpackage/linux/native/libapplauncher/LinuxPlatform.cpp src/jdk.incubator.jpackage/linux/native/libapplauncher/LinuxPlatform.h src/jdk.incubator.jpackage/linux/native/libapplauncher/PlatformDefs.h src/jdk.incubator.jpackage/macosx/native/jpackageapplauncher/main.m src/jdk.incubator.jpackage/macosx/native/libapplauncher/MacPlatform.h src/jdk.incubator.jpackage/macosx/native/libapplauncher/MacPlatform.mm src/jdk.incubator.jpackage/macosx/native/libapplauncher/PlatformDefs.h src/jdk.incubator.jpackage/share/native/libapplauncher/FileAttributes.h src/jdk.incubator.jpackage/share/native/libapplauncher/FilePath.h src/jdk.incubator.jpackage/share/native/libapplauncher/Helpers.cpp src/jdk.incubator.jpackage/share/native/libapplauncher/Helpers.h src/jdk.incubator.jpackage/share/native/libapplauncher/IniFile.cpp src/jdk.incubator.jpackage/share/native/libapplauncher/IniFile.h src/jdk.incubator.jpackage/share/native/libapplauncher/JavaVirtualMachine.cpp src/jdk.incubator.jpackage/share/native/libapplauncher/JavaVirtualMachine.h src/jdk.incubator.jpackage/share/native/libapplauncher/Library.cpp src/jdk.incubator.jpackage/share/native/libapplauncher/Library.h src/jdk.incubator.jpackage/share/native/libapplauncher/Macros.cpp src/jdk.incubator.jpackage/share/native/libapplauncher/Macros.h src/jdk.incubator.jpackage/share/native/libapplauncher/Messages.cpp src/jdk.incubator.jpackage/share/native/libapplauncher/Messages.h src/jdk.incubator.jpackage/share/native/libapplauncher/OrderedMap.h src/jdk.incubator.jpackage/share/native/libapplauncher/Package.cpp src/jdk.incubator.jpackage/share/native/libapplauncher/Package.h src/jdk.incubator.jpackage/share/native/libapplauncher/Platform.cpp src/jdk.incubator.jpackage/share/native/libapplauncher/Platform.h src/jdk.incubator.jpackage/share/native/libapplauncher/PlatformString.cpp src/jdk.incubator.jpackage/share/native/libapplauncher/PlatformString.h src/jdk.incubator.jpackage/share/native/libapplauncher/Properties.h src/jdk.incubator.jpackage/share/native/libapplauncher/PropertyFile.cpp src/jdk.incubator.jpackage/share/native/libapplauncher/PropertyFile.h src/jdk.incubator.jpackage/share/native/libapplauncher/main.cpp src/jdk.incubator.jpackage/unix/native/libapplauncher/FileAttribute.h src/jdk.incubator.jpackage/unix/native/libapplauncher/FileAttributes.cpp src/jdk.incubator.jpackage/unix/native/libapplauncher/FilePath.cpp src/jdk.incubator.jpackage/unix/native/libapplauncher/PosixPlatform.cpp src/jdk.incubator.jpackage/unix/native/libapplauncher/PosixPlatform.h src/jdk.incubator.jpackage/windows/native/jpackageapplauncher/WinLauncher.cpp src/jdk.incubator.jpackage/windows/native/libapplauncher/DllMain.cpp src/jdk.incubator.jpackage/windows/native/libapplauncher/FileAttribute.h src/jdk.incubator.jpackage/windows/native/libapplauncher/FilePath.cpp src/jdk.incubator.jpackage/windows/native/libapplauncher/PlatformDefs.h src/jdk.incubator.jpackage/windows/native/libapplauncher/WindowsPlatform.cpp src/jdk.incubator.jpackage/windows/native/libapplauncher/WindowsPlatform.h src/jdk.incubator.jpackage/windows/native/libjpackage/ByteBuffer.cpp src/jdk.incubator.jpackage/windows/native/libjpackage/ByteBuffer.h src/jdk.incubator.jpackage/windows/native/libjpackage/ErrorHandling.cpp src/jdk.incubator.jpackage/windows/native/libjpackage/ErrorHandling.h src/jdk.incubator.jpackage/windows/native/libjpackage/FileUtils.cpp src/jdk.incubator.jpackage/windows/native/libjpackage/FileUtils.h src/jdk.incubator.jpackage/windows/native/libjpackage/Log.cpp src/jdk.incubator.jpackage/windows/native/libjpackage/Log.h src/jdk.incubator.jpackage/windows/native/libjpackage/SourceCodePos.h src/jdk.incubator.jpackage/windows/native/libjpackage/SysInfo.h src/jdk.incubator.jpackage/windows/native/libjpackage/UniqueHandle.h src/jdk.incubator.jpackage/windows/native/libjpackage/Utils.cpp src/jdk.incubator.jpackage/windows/native/libjpackage/Utils.h src/jdk.incubator.jpackage/windows/native/libjpackage/VersionInfoSwap.cpp src/jdk.incubator.jpackage/windows/native/libjpackage/VersionInfoSwap.h src/jdk.incubator.jpackage/windows/native/libjpackage/WinErrorHandling.cpp src/jdk.incubator.jpackage/windows/native/libjpackage/WinErrorHandling.h src/jdk.incubator.jpackage/windows/native/libjpackage/WinSysInfo.cpp src/jdk.incubator.jpackage/windows/native/libjpackage/WinSysInfo.h src/jdk.incubator.jpackage/windows/native/libjpackage/tstrings.cpp src/jdk.incubator.jpackage/windows/native/libjpackage/tstrings.h test/hotspot/jtreg/vmTestbase/gc/huge/quicklook/largeheap/MemOptions/MemOptions.sh test/hotspot/jtreg/vmTestbase/gc/huge/quicklook/largeheap/MemOptions/MemStat.java test/hotspot/jtreg/vmTestbase/gc/huge/quicklook/largeheap/MemOptions/TEST.properties test/hotspot/jtreg/vmTestbase/gc/huge/quicklook/largeheap/MemOptions/TestDescription.java test/jdk/java/lang/management/MemoryMXBean/MemoryTestZGC.sh test/jdk/javax/net/ssl/compatibility/Cert.java test/jdk/javax/net/ssl/compatibility/Client.java test/jdk/javax/net/ssl/compatibility/Compatibility.java test/jdk/javax/net/ssl/compatibility/JdkUtils.java test/jdk/javax/net/ssl/compatibility/ProcessUtils.java test/jdk/javax/net/ssl/compatibility/Server.java test/jdk/javax/net/ssl/compatibility/Status.java test/jdk/javax/net/ssl/compatibility/TestCase.java test/jdk/javax/net/ssl/compatibility/UseCase.java
diffstat 2572 files changed, 46062 insertions(+), 60288 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon May 04 13:11:07 2020 -0700
+++ b/.hgtags	Mon May 04 16:53:49 2020 -0700
@@ -630,3 +630,5 @@
 dd5198db2e5b1ebcafe065d987c03ba9fcb50fc3 jdk-15+17
 44aef192b488a48cce12422394691a6b1d16b98e jdk-15+18
 7cc27caabe6e342151e8baf549beb07a9c755ec2 jdk-15+19
+46bca5e5e6fb26efd07245d26fe96a9c3260f51e jdk-15+20
+12b55fad80f30d24b1f8fdb3b947ea6465ef9518 jdk-15+21
--- a/bin/idea.sh	Mon May 04 13:11:07 2020 -0700
+++ b/bin/idea.sh	Mon May 04 16:53:49 2020 -0700
@@ -197,13 +197,15 @@
 rm -rf $CLASSES; mkdir $CLASSES
 
 if [ "x$CYGPATH" = "x" ] ; then ## CYGPATH may be set in env.cfg
-  JAVAC_SOURCE_FILE=$IDEA_OUTPUT/src/idea/JdkIdeaAntLogger.java
+  JAVAC_SOURCE_FILE=$IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java
+  JAVAC_SOURCE_PATH=$IDEA_OUTPUT/src
   JAVAC_CLASSES=$CLASSES
   JAVAC_CP=$CP
 else
-  JAVAC_SOURCE_FILE=`cygpath -am $IDEA_OUTPUT/src/idea/JdkIdeaAntLogger.java`
+  JAVAC_SOURCE_FILE=`cygpath -am $IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java`
+  JAVAC_SOURCE_PATH=`cygpath -am $IDEA_OUTPUT/src`
   JAVAC_CLASSES=`cygpath -am $CLASSES`
   JAVAC_CP=`cygpath -am $CP`
 fi
 
-$BOOT_JDK/bin/javac -d $JAVAC_CLASSES -cp $JAVAC_CP $JAVAC_SOURCE_FILE
+$BOOT_JDK/bin/javac -d $JAVAC_CLASSES -sourcepath $JAVAC_SOURCE_PATH -cp $JAVAC_CP $JAVAC_SOURCE_FILE
--- a/doc/building.html	Mon May 04 13:11:07 2020 -0700
+++ b/doc/building.html	Mon May 04 16:53:49 2020 -0700
@@ -578,7 +578,7 @@
 </ul>
 <h2 id="running-tests">Running Tests</h2>
 <p>Most of the JDK tests are using the <a href="http://openjdk.java.net/jtreg">JTReg</a> test framework. Make sure that your configuration knows where to find your installation of JTReg. If this is not picked up automatically, use the <code>--with-jtreg=&lt;path to jtreg home&gt;</code> option to point to the JTReg framework. Note that this option should point to the JTReg home, i.e. the top directory, containing <code>lib/jtreg.jar</code> etc.</p>
-<p>The <a href="https://wiki.openjdk.java.net/display/Adoption">Adoption Group</a> provides recent builds of jtreg <a href="https://adopt-openjdk.ci.cloudbees.com/job/jtreg/lastSuccessfulBuild/artifact">here</a>. Download the latest <code>.tar.gz</code> file, unpack it, and point <code>--with-jtreg</code> to the <code>jtreg</code> directory that you just unpacked.</p>
+<p>The <a href="https://wiki.openjdk.java.net/display/Adoption">Adoption Group</a> provides recent builds of jtreg <a href="https://ci.adoptopenjdk.net/view/Dependencies/job/jtreg/lastSuccessfulBuild/artifact">here</a>. Download the latest <code>.tar.gz</code> file, unpack it, and point <code>--with-jtreg</code> to the <code>jtreg</code> directory that you just unpacked.</p>
 <p>To execute the most basic tests (tier 1), use:</p>
 <pre><code>make run-test-tier1</code></pre>
 <p>For more details on how to run tests, please see the <a href="testing.html">Testing the JDK</a> document.</p>
--- a/doc/building.md	Mon May 04 13:11:07 2020 -0700
+++ b/doc/building.md	Mon May 04 16:53:49 2020 -0700
@@ -891,7 +891,7 @@
 
 The [Adoption Group](https://wiki.openjdk.java.net/display/Adoption) provides
 recent builds of jtreg [here](
-https://adopt-openjdk.ci.cloudbees.com/job/jtreg/lastSuccessfulBuild/artifact).
+https://ci.adoptopenjdk.net/view/Dependencies/job/jtreg/lastSuccessfulBuild/artifact).
 Download the latest `.tar.gz` file, unpack it, and point `--with-jtreg` to the
 `jtreg` directory that you just unpacked.
 
--- a/doc/testing.html	Mon May 04 13:11:07 2020 -0700
+++ b/doc/testing.html	Mon May 04 16:53:49 2020 -0700
@@ -56,7 +56,7 @@
 $ make test-jdk_lang JTREG=&quot;JOBS=8&quot;
 $ make test TEST=jdk_lang
 $ make test-only TEST=&quot;gtest:LogTagSet gtest:LogTagSetDescriptions&quot; GTEST=&quot;REPEAT=-1&quot;
-$ make test TEST=&quot;hotspot:hotspot_gc&quot; JTREG=&quot;JOBS=1;TIMEOUT_FACTOR=8;VM_OPTIONS=-XshowSettings -Xlog:gc+ref=debug&quot;
+$ make test TEST=&quot;hotspot:hotspot_gc&quot; JTREG=&quot;JOBS=1;TIMEOUT_FACTOR=8;JAVA_OPTIONS=-XshowSettings -Xlog:gc+ref=debug&quot;
 $ make test TEST=&quot;jtreg:test/hotspot:hotspot_gc test/hotspot/jtreg/native_sanity/JniVersion.java&quot;
 $ make test TEST=&quot;micro:java.lang.reflect&quot; MICRO=&quot;FORK=1;WARMUP_ITER=2&quot;
 $ make exploded-test TEST=tier2</code></pre>
@@ -106,8 +106,8 @@
 <h2 id="test-suite-control">Test suite control</h2>
 <p>It is possible to control various aspects of the test suites using make control variables.</p>
 <p>These variables use a keyword=value approach to allow multiple values to be set. So, for instance, <code>JTREG=&quot;JOBS=1;TIMEOUT_FACTOR=8&quot;</code> will set the JTReg concurrency level to 1 and the timeout factor to 8. This is equivalent to setting <code>JTREG_JOBS=1 JTREG_TIMEOUT_FACTOR=8</code>, but using the keyword format means that the <code>JTREG</code> variable is parsed and verified for correctness, so <code>JTREG=&quot;TMIEOUT_FACTOR=8&quot;</code> would give an error, while <code>JTREG_TMIEOUT_FACTOR=8</code> would just pass unnoticed.</p>
-<p>To separate multiple keyword=value pairs, use <code>;</code> (semicolon). Since the shell normally eats <code>;</code>, the recommended usage is to write the assignment inside qoutes, e.g. <code>JTREG=&quot;...;...&quot;</code>. This will also make sure spaces are preserved, as in <code>JTREG=&quot;VM_OPTIONS=-XshowSettings -Xlog:gc+ref=debug&quot;</code>.</p>
-<p>(Other ways are possible, e.g. using backslash: <code>JTREG=JOBS=1\;TIMEOUT_FACTOR=8</code>. Also, as a special technique, the string <code>%20</code> will be replaced with space for certain options, e.g. <code>JTREG=VM_OPTIONS=-XshowSettings%20-Xlog:gc+ref=debug</code>. This can be useful if you have layers of scripts and have trouble getting proper quoting of command line arguments through.)</p>
+<p>To separate multiple keyword=value pairs, use <code>;</code> (semicolon). Since the shell normally eats <code>;</code>, the recommended usage is to write the assignment inside qoutes, e.g. <code>JTREG=&quot;...;...&quot;</code>. This will also make sure spaces are preserved, as in <code>JTREG=&quot;JAVA_OPTIONS=-XshowSettings -Xlog:gc+ref=debug&quot;</code>.</p>
+<p>(Other ways are possible, e.g. using backslash: <code>JTREG=JOBS=1\;TIMEOUT_FACTOR=8</code>. Also, as a special technique, the string <code>%20</code> will be replaced with space for certain options, e.g. <code>JTREG=JAVA_OPTIONS=-XshowSettings%20-Xlog:gc+ref=debug</code>. This can be useful if you have layers of scripts and have trouble getting proper quoting of command line arguments through.)</p>
 <p>As far as possible, the names of the keywords have been standardized between test suites.</p>
 <h3 id="general-keywords-test_opts">General keywords (TEST_OPTS)</h3>
 <p>Some keywords are valid across different test suites. If you want to run tests from multiple test suites, or just don't want to care which test suite specific control variable to use, then you can use the general TEST_OPTS control variable.</p>
@@ -116,16 +116,16 @@
 <p>Currently only applies to JTReg.</p>
 <h4 id="timeout_factor">TIMEOUT_FACTOR</h4>
 <p>Currently only applies to JTReg.</p>
+<h4 id="java_options">JAVA_OPTIONS</h4>
+<p>Applies to JTReg, GTest and Micro.</p>
 <h4 id="vm_options">VM_OPTIONS</h4>
 <p>Applies to JTReg, GTest and Micro.</p>
-<h4 id="java_options">JAVA_OPTIONS</h4>
-<p>Applies to JTReg, GTest and Micro.</p>
 <h4 id="aot_modules">AOT_MODULES</h4>
 <p>Applies to JTReg and GTest.</p>
 <h4 id="jcov">JCOV</h4>
 <p>This keywords applies globally to the test runner system. If set to <code>true</code>, it enables JCov coverage reporting for all tests run. To be useful, the JDK under test must be run with a JDK built with JCov instrumentation (<code>configure --with-jcov=&lt;path to directory containing lib/jcov.jar&gt;</code>, <code>make jcov-image</code>).</p>
 <p>The simplest way to run tests with JCov coverage report is to use the special target <code>jcov-test</code> instead of <code>test</code>, e.g. <code>make jcov-test TEST=jdk_lang</code>. This will make sure the JCov image is built, and that JCov reporting is enabled.</p>
-<p>The JCov report is stored in <code>build/$BUILD/test-results/jcov-output</code>.</p>
+<p>The JCov report is stored in <code>build/$BUILD/test-results/jcov-output/report</code>.</p>
 <p>Please note that running with JCov reporting can be very memory intensive.</p>
 <h4 id="jcov_diff_changeset">JCOV_DIFF_CHANGESET</h4>
 <p>While collecting code coverage with JCov, it is also possible to find coverage for only recently changed code. JCOV_DIFF_CHANGESET specifies a source revision. A textual report will be generated showing coverage of the diff between the specified revision and the repository tip.</p>
@@ -166,9 +166,10 @@
 <p>Additional options to the JTReg test framework.</p>
 <p>Use <code>JTREG=&quot;OPTIONS=--help all&quot;</code> to see all available JTReg options.</p>
 <h4 id="java_options-1">JAVA_OPTIONS</h4>
-<p>Additional Java options to JTReg (<code>-javaoption</code>).</p>
+<p>Additional Java options for running test classes (sent to JTReg as <code>-javaoption</code>).</p>
 <h4 id="vm_options-1">VM_OPTIONS</h4>
-<p>Additional VM options to JTReg (<code>-vmoption</code>).</p>
+<p>Additional Java options to be used when compiling and running classes (sent to JTReg as <code>-vmoption</code>).</p>
+<p>This option is only needed in special circumstances. To pass Java options to your test classes, use <code>JAVA_OPTIONS</code>.</p>
 <h4 id="aot_modules-1">AOT_MODULES</h4>
 <p>Generate AOT modules before testing for the specified module, or set of modules. If multiple modules are specified, they should be separated by space (or, to help avoid quoting issues, the spec