Merge branch 'master' into utf8-minor-cleanup

Author: magicus

.github/actions/get-bundles/action.yml

@@ -32,10 +32,16 @@ inputs:
   debug-suffix:
     description: 'File name suffix denoting debug level, possibly empty'
     required: false
+  static-suffix:
+    description: 'Static bundle file name suffix'
+    required: false
 outputs:
   jdk-path:
     description: 'Path to the installed JDK bundle'
     value: ${{ steps.path-name.outputs.jdk }}
+  static-jdk-path:
+    description: 'Path to the installed static JDK bundle'
+    value: ${{ steps.path-name.outputs.static_jdk }}
   symbols-path:
     description: 'Path to the installed symbols bundle'
     value: ${{ steps.path-name.outputs.symbols }}
@@ -61,6 +67,15 @@ runs:
         path: bundles
       if: steps.download-bundles.outcome == 'failure'
 
+    - name: 'Download static bundles artifact'
+      id: download-static-bundles
+      uses: actions/download-artifact@v4
+      with:
+        name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}
+        path: bundles
+      continue-on-error: true
+      if: ${{ inputs.static-suffix == '-static' }}
+
     - name: 'Unpack bundles'
       run: |
         if [[ -e bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.zip ]]; then
@@ -75,6 +90,20 @@ runs:
           tar -xf bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz -C bundles/jdk
         fi
 
+        if [[ '${{ inputs.static-suffix }}' == '-static' ]]; then
+          if [[ -e bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}.zip ]]; then
+            echo 'Unpacking static jdk bundle...'
+            mkdir -p bundles/static-jdk
+            unzip -q bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}.zip -d bundles/static-jdk
+          fi
+
+          if [[ -e bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}.tar.gz ]]; then
+            echo 'Unpacking static jdk bundle...'
+            mkdir -p bundles/static-jdk
+            tar -xf bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}.tar.gz -C bundles/static-jdk
+          fi
+        fi
+
         if [[ -e bundles/symbols-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz ]]; then
           echo 'Unpacking symbols bundle...'
           mkdir -p bundles/symbols
@@ -106,4 +135,12 @@ runs:
         echo "jdk=$jdk_dir" >> $GITHUB_OUTPUT
         echo "symbols=$symbols_dir" >> $GITHUB_OUTPUT
         echo "tests=$tests_dir" >> $GITHUB_OUTPUT
+
+        if [[ '${{ inputs.static-suffix }}' == '-static' ]]; then
+          static_jdk_dir="$GITHUB_WORKSPACE/$(dirname $(find bundles/static-jdk -name bin -type d))"
+          if [[ '${{ runner.os }}' == 'Windows' ]]; then
+            static_jdk_dir="$(cygpath $static_jdk_dir)"
+          fi
+          echo "static_jdk=$static_jdk_dir" >> $GITHUB_OUTPUT
+        fi
       shell: bash

.github/actions/upload-bundles/action.yml

@@ -35,6 +35,9 @@ inputs:
   bundle-suffix:
     description: 'Bundle name suffix, possibly empty'
     required: false
+  static-suffix:
+    description: 'Static JDK bundle name suffix, possibly empty'
+    required: false
 
 runs:
   using: composite
@@ -46,6 +49,8 @@ runs:
         # Rename bundles to consistent names
         jdk_bundle_zip="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}.zip 2> /dev/null || true)"
         jdk_bundle_tar_gz="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
+        static_jdk_bundle_zip="$(ls build/*/bundles/static-jdk-*_bin${{ inputs.debug-suffix }}.zip 2> /dev/null || true)"
+        static_jdk_bundle_tar_gz="$(ls build/*/bundles/static-jdk-*_bin${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
         symbols_bundle="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}-symbols.tar.gz 2> /dev/null || true)"
         tests_bundle="$(ls build/*/bundles/jdk-*_bin-tests${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
         static_libs_bundle="$(ls build/*/bundles/jdk-*_bin-static-libs${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
@@ -58,6 +63,12 @@ runs:
         if [[ "$jdk_bundle_tar_gz" != "" ]]; then
           mv "$jdk_bundle_tar_gz" "bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz"
         fi
+        if [[ "$static_jdk_bundle_zip" != "" ]]; then
+          mv "$static_jdk_bundle_zip" "bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}.zip"
+        fi
+        if [[ "$static_jdk_bundle_tar_gz" != "" ]]; then
+          mv "$static_jdk_bundle_tar_gz" "bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}.tar.gz"
+        fi
         if [[ "$symbols_bundle" != "" ]]; then
           mv "$symbols_bundle" "bundles/symbols-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz"
         fi
@@ -68,7 +79,7 @@ runs:
           mv "$static_libs_bundle" "bundles/static-libs-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz"
         fi
 
-        if [[ "$jdk_bundle_zip$jdk_bundle_tar_gz$symbols_bundle$tests_bundle$static_libs_bundle" != "" ]]; then
+        if [[ "$jdk_bundle_zip$jdk_bundle_tar_gz$static_jdk_bundle_zip$static_jdk_bundle_tar_gz$symbols_bundle$tests_bundle$static_libs_bundle" != "" ]]; then
           echo 'bundles-found=true' >> $GITHUB_OUTPUT
         else
           echo 'bundles-found=false' >> $GITHUB_OUTPUT
@@ -78,7 +89,7 @@ runs:
     - name: 'Upload bundles artifact'
       uses: actions/upload-artifact@v4
       with:
-        name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.bundle-suffix }}
+        name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}${{ inputs.bundle-suffix }}
         path: bundles
         retention-days: 1
       if: steps.bundles.outputs.bundles-found == 'true'

.github/workflows/build-linux.yml

@@ -64,6 +64,9 @@ on:
       bundle-suffix:
         required: false
         type: string
+      static-suffix:
+        required: false
+        type: string
 
 jobs:
   build-linux:
@@ -143,3 +146,4 @@ jobs:
           platform: ${{ inputs.platform }}
           debug-suffix: "${{ matrix.debug-level == 'debug' && '-debug' || '' }}"
           bundle-suffix: ${{ inputs.bundle-suffix }}
+          static-suffix: ${{ inputs.static-suffix }}

.github/workflows/main.yml

@@ -231,16 +231,14 @@ jobs:
     uses: ./.github/workflows/build-linux.yml
     with:
       platform: linux-x64
-      make-target: 'static-jdk-image'
+      make-target: 'static-jdk-bundles'
       # There are issues with fastdebug static build in GHA due to space limit.
       # Only do release build for now.
       debug-levels: '[ "release" ]'
       gcc-major-version: '10'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-      # It currently doesn't produce any bundles, but probably will do in
-      # the future.
-      bundle-suffix: "-static"
+      static-suffix: "-static"
     if: needs.prepare.outputs.linux-x64 == 'true'
 
   build-linux-x64-static-libs:
@@ -361,6 +359,19 @@ jobs:
       platform: linux-x64
       bootjdk-platform: linux-x64
       runs-on: ubuntu-22.04
+      debug-suffix: -debug
+
+  test-linux-x64-static:
+    name: linux-x64-static
+    needs:
+      - build-linux-x64
+      - build-linux-x64-static
+    uses: ./.github/workflows/test.yml
+    with:
+      platform: linux-x64
+      bootjdk-platform: linux-x64
+      runs-on: ubuntu-22.04
+      static-suffix: "-static"
 
   test-macos-aarch64:
     name: macos-aarch64
@@ -372,6 +383,7 @@ jobs:
       bootjdk-platform: macos-aarch64
       runs-on: macos-14
       xcode-toolset-version: '15.4'
+      debug-suffix: -debug
 
   test-windows-x64:
     name: windows-x64
@@ -382,3 +394,4 @@ jobs:
       platform: windows-x64
       bootjdk-platform: windows-x64
       runs-on: windows-2019
+      debug-suffix: -debug

.github/workflows/test.yml

@@ -40,6 +40,12 @@ on:
       xcode-toolset-version:
         required: false
         type: string
+      debug-suffix:
+        required: false
+        type: string
+      static-suffix:
+        required: false
+        type: string
 
 env:
   # These are needed to make the MSYS2 bash work properly
@@ -86,35 +92,35 @@ jobs:
 
           - test-name: 'hs/tier1 common'
             test-suite: 'test/hotspot/jtreg/:tier1_common'
-            debug-suffix: -debug
+            debug-suffix: ${{ inputs.debug-suffix }}
 
           - test-name: 'hs/tier1 compiler part 1'
             test-suite: 'test/hotspot/jtreg/:tier1_compiler_1'
-            debug-suffix: -debug
+            debug-suffix: ${{ inputs.debug-suffix }}
 
           - test-name: 'hs/tier1 compiler part 2'
             test-suite: 'test/hotspot/jtreg/:tier1_compiler_2'
-            debug-suffix: -debug
+            debug-suffix: ${{ inputs.debug-suffix }}
 
           - test-name: 'hs/tier1 compiler part 3'
             test-suite: 'test/hotspot/jtreg/:tier1_compiler_3'
-            debug-suffix: -debug
+            debug-suffix: ${{ inputs.debug-suffix }}
 
           - test-name: 'hs/tier1 gc'
             test-suite: 'test/hotspot/jtreg/:tier1_gc'
-            debug-suffix: -debug
+            debug-suffix: ${{ inputs.debug-suffix }}
 
           - test-name: 'hs/tier1 runtime'
             test-suite: 'test/hotspot/jtreg/:tier1_runtime'
-            debug-suffix: -debug
+            debug-suffix: ${{ inputs.debug-suffix }}
 
           - test-name: 'hs/tier1 serviceability'
             test-suite: 'test/hotspot/jtreg/:tier1_serviceability'
-            debug-suffix: -debug
+            debug-suffix: ${{ inputs.debug-suffix }}
 
           - test-name: 'lib-test/tier1'
             test-suite: 'test/lib-test/:tier1'
-            debug-suffix: -debug
+            debug-suffix: ${{ inputs.debug-suffix }}
 
     steps:
       - name: 'Checkout the JDK source'
@@ -140,6 +146,7 @@ jobs:
         with:
           platform: ${{ inputs.platform }}
           debug-suffix: ${{ matrix.debug-suffix }}
+          static-suffix: ${{ inputs.static-suffix }}
 
       - name: 'Install dependencies'
         run: |
@@ -160,6 +167,21 @@ jobs:
           else
             echo "value=$PATH" >> $GITHUB_OUTPUT
           fi
+          if [[ '${{ inputs.static-suffix }}' == '-static' ]]; then
+            echo "static-hotspot-problemlist-path=`pwd`/test/hotspot/jtreg/ProblemList-StaticJdk.txt" >> $GITHUB_OUTPUT
+            echo "static-jdk-problemlist-path=`pwd`/test/jdk/ProblemList-StaticJdk.txt" >> $GITHUB_OUTPUT
+            echo "static-langtools-problemlist-path=`pwd`/test/langtools/ProblemList-StaticJdk.txt" >> $GITHUB_OUTPUT
+            echo "static-lib-test-problemlist-path=`pwd`/test/lib-test/ProblemList-StaticJdk.txt" >> $GITHUB_OUTPUT
+          fi
+
+      - name: 'Set Extra Options'
+        id: extra-options
+        run: |
+          if [[ '${{ inputs.static-suffix }}' == '-static' ]]; then
+            echo "test-jdk=JDK_UNDER_TEST=${{ steps.bundles.outputs.static-jdk-path }}" >> $GITHUB_OUTPUT
+            echo "compile-jdk=JDK_FOR_COMPILE=${{ steps.bundles.outputs.jdk-path }}" >> $GITHUB_OUTPUT
+            echo "extra-problem-lists=EXTRA_PROBLEM_LISTS=${{ steps.path.outputs.static-hotspot-problemlist-path }}%20${{ steps.path.outputs.static-jdk-problemlist-path }}%20${{ steps.path.outputs.static-langtools-problemlist-path }}%20${{ steps.path.outputs.static-lib-test-problemlist-path }}" >> $GITHUB_OUTPUT
+          fi
 
       - name: 'Run tests'
         id: run-tests
@@ -171,7 +193,9 @@ jobs:
           JDK_IMAGE_DIR=${{ steps.bundles.outputs.jdk-path }}
           SYMBOLS_IMAGE_DIR=${{ steps.bundles.outputs.symbols-path }}
           TEST_IMAGE_DIR=${{ steps.bundles.outputs.tests-path }}
-          JTREG='JAVA_OPTIONS=-XX:-CreateCoredumpOnCrash;VERBOSE=fail,error,time;KEYWORDS=!headful'
+          ${{ steps.extra-options.outputs.test-jdk }}
+          ${{ steps.extra-options.outputs.compile-jdk }}
+          JTREG='JAVA_OPTIONS=-XX:-CreateCoredumpOnCrash;VERBOSE=fail,error,time;KEYWORDS=!headful;${{ steps.extra-options.outputs.extra-problem-lists }}'
           && bash ./.github/scripts/gen-test-summary.sh "$GITHUB_STEP_SUMMARY" "$GITHUB_OUTPUT"
         env:
           PATH: ${{ steps.path.outputs.value }}
@@ -204,7 +228,7 @@ jobs:
             echo '::warning ::Missing test-support directory'
           fi
 
-          artifact_name="results-${{ inputs.platform }}-$(echo ${{ matrix.test-name }} | tr '/ ' '__')"
+          artifact_name="results-${{ inputs.platform }}-$(echo ${{ matrix.test-name }}${{ inputs.static-suffix }} | tr '/ ' '__')"
           echo "artifact-name=$artifact_name" >> $GITHUB_OUTPUT
         if: always()
 

.gitignore

@@ -23,3 +23,5 @@ NashornProfile.txt
 /.gdbinit
 /.lldbinit
 **/core.[0-9]*
+*.rej
+*.orig

doc/testing.html

@@ -72,6 +72,11 @@ <h1 class="title">Testing the JDK</h1>
 <li><a href="#non-us-locale" id="toc-non-us-locale">Non-US
 locale</a></li>
 <li><a href="#pkcs11-tests" id="toc-pkcs11-tests">PKCS11 Tests</a></li>
+</ul></li>
+<li><a href="#testing-ahead-of-time-optimizations"
+id="toc-testing-ahead-of-time-optimizations">### Testing Ahead-of-time
+Optimizations</a>
+<ul>
 <li><a href="#testing-with-alternative-security-providers"
 id="toc-testing-with-alternative-security-providers">Testing with
 alternative security providers</a></li>
@@ -596,6 +601,37 @@ <h3 id="pkcs11-tests">PKCS11 Tests</h3>
     JTREG=&quot;JAVA_OPTIONS=-Djdk.test.lib.artifacts.nsslib-linux_aarch64=/path/to/NSS-libs&quot;</code></pre>
 <p>For more notes about the PKCS11 tests, please refer to
 test/jdk/sun/security/pkcs11/README.</p>
+<h2 id="testing-ahead-of-time-optimizations">### Testing Ahead-of-time
+Optimizations</h2>
+<p>One way to improve test coverage of ahead-of-time (AOT) optimizations
+in the JDK is to run existing jtreg test cases in a special "AOT_JDK"
+mode. Example:</p>
+<pre><code>$ make test JTREG=&quot;AOT_JDK=onestep&quot; \
+    TEST=open/test/hotspot/jtreg/runtime/invokedynamic</code></pre>
+<p>In this testing mode, we first perform an AOT training run (see
+https://openjdk.org/jeps/483) of a special test program (<a
+href="../test/setup_aot/TestSetupAOT.java">test/setup_aot/TestSetupAOT.java</a>)
+that accesses about 5,0000 classes in the JDK core libraries.
+Optimization artifacts for these classes (such as pre-linked lambda
+expressions, execution profiles, and pre-generated native code) are
+stored into an AOT cache file, which will be used by all the JVMs
+launched by the selected jtreg test cases.</p>
+<p>When the jtreg tests call into the core libraries classes that are in
+the AOT cache, we will be able to test the AOT optimizations that were
+used on those classes.</p>
+<p>Please note that not all existing jtreg test cases can be executed
+with the AOT_JDK mode. See <a
+href="../test/hotspot/jtreg/ProblemList-AotJdk.txt">test/hotspot/jtreg/ProblemList-AotJdk.txt</a>
+and <a
+href="../test/jdk/ProblemList-AotJdk.txt">test/jdk/ProblemList-AotJdk.txt</a>.</p>
+<p>Also, test cases that were written specifically to test AOT, such as
+the tests under <a
+href="../test/hotspot/jtreg/runtime/cds/">test/hotspot/jtreg/runtime/cds</a>,
+cannot be executed with the AOT_JDK mode.</p>
+<p>Valid values for <code>AOT_JDK</code> are <code>onestep</code> and
+<code>twostep</code>. These control how the AOT cache is generated. See
+https://openjdk.org/jeps/514 for details. All other values are
+ignored.</p>
 <h3 id="testing-with-alternative-security-providers">Testing with
 alternative security providers</h3>
 <p>Some security tests use a hardcoded provider for

doc/testing.md

@@ -611,6 +611,43 @@ $ make test TEST="jtreg:sun/security/pkcs11/Secmod/AddTrustedCert.java" \
 For more notes about the PKCS11 tests, please refer to
 test/jdk/sun/security/pkcs11/README.
 
+### Testing Ahead-of-time Optimizations
+-------------------------------------------------------------------------------
+One way to improve test coverage of ahead-of-time (AOT) optimizations in
+the JDK is to run existing jtreg test cases in a special "AOT_JDK" mode.
+Example:
+
+```
+$ make test JTREG="AOT_JDK=onestep" \
+    TEST=open/test/hotspot/jtreg/runtime/invokedynamic
+```
+
+In this testing mode, we first perform an AOT training run
+(see https://openjdk.org/jeps/483) of a special test program
+([test/setup_aot/TestSetupAOT.java](../test/setup_aot/TestSetupAOT.java))
+that accesses about 5,0000 classes in the JDK core libraries.
+Optimization artifacts for these classes (such as pre-linked
+lambda expressions, execution profiles, and pre-generated native code)
+are stored into an AOT cache file, which will be used by all the JVMs
+launched by the selected jtreg test cases.
+
+When the jtreg tests call into the core libraries classes that are in
+the AOT cache, we will be able to test the AOT optimizations that were
+used on those classes.
+
+Please note that not all existing jtreg test cases can be executed with
+the AOT_JDK mode. See
+[test/hotspot/jtreg/ProblemList-AotJdk.txt](../test/hotspot/jtreg/ProblemList-AotJdk.txt)
+and [test/jdk/ProblemList-AotJdk.txt](../test/jdk/ProblemList-AotJdk.txt).
+
+Also, test cases that were written specifically to test AOT, such as the tests
+under [test/hotspot/jtreg/runtime/cds](../test/hotspot/jtreg/runtime/cds/),
+cannot be executed with the AOT_JDK mode.
+
+Valid values for `AOT_JDK` are `onestep` and `twostep`. These control how
+the AOT cache is generated. See https://openjdk.org/jeps/514 for details.
+All other values are ignored.
+
 ### Testing with alternative security providers
 
 Some security tests use a hardcoded provider for `KeyFactory`, `Cipher`,

make/CompileInterimLangtools.gmk

@@ -99,6 +99,7 @@ define SetupInterimModule
       EXCLUDE_FILES := $(TOPDIR)/src/$1/share/classes/module-info.java \
           $(TOPDIR)/src/$1/share/classes/javax/tools/ToolProvider.java \
           $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/Main.java \
+          $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/MemoryClassLoader.java \
           $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/MemoryContext.java \
           $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/MemoryModuleFinder.java \
           $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/SourceLauncher.java \