8352437: Support --add-exports with -XX:+AOTClassLinking #24124

iklam · 2025-03-20T04:46:21Z

-XX:+AOTClassLinking requires the CDS archived full module graph (FMG).

Before this PR, when --add-export is specified, FMG is disabled, so AOT caches created with -XX:+AOTClassLinking cannot be loaded.
After this PR, if the exact same --add-export flags as specified across the training/assembly/production phases, the FMG can be used, so we can use so AOT caches created with -XX:+AOTClassLinking.

The change itself is straight-forward: just remember the --add-export flags specified during AOT cache creation, and check the exact same ones are used during the production run.

I did a fair amount of refactoring to change the "exact options specified" checks in modules.cpp, so more such options can be easily added in the future (we need to handle --add-reads and --add-opens in future RFEs).

(Note: this PR depends on #24122 )

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change must not contain extraneous whitespace
Commit message must refer to an issue

Issue

JDK-8352437: Support --add-exports with -XX:+AOTClassLinking (Enhancement - P4)

Reviewers

Matias Saavedra Silva (@matias9927 - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/24124/head:pull/24124
$ git checkout pull/24124

Update a local copy of the PR:
$ git checkout pull/24124
$ git pull https://git.openjdk.org/jdk.git pull/24124/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 24124

View PR using the GUI difftool:
$ git pr show -t 24124

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/24124.diff

Using Webrev

Link to Webrev Comment

bridgekeeper · 2025-03-20T04:46:55Z

👋 Welcome back iklam! A progress list of the required criteria for merging this PR into pr/24122 will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2025-03-20T04:47:20Z

@iklam This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8352437: Support --add-exports with -XX:+AOTClassLinking

Reviewed-by: matsaave

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 60 new commits pushed to the master branch:

6891490: 8353324: Clean up of comments and import after 8319192
07fd666: 8342984: Bump minimum boot jdk to JDK 24
6a46d55: 8353129: CDS ArchiveRelocation tests fail after JDK-8325132
19eabaf: 8353227: JFR: Prepare tests for strong parser validation
564066d: 8353118: Deprecate the use of java.locale.useOldISOCodes system property
a1ab1d8: 8353449: [BACKOUT] One instance of STATIC_LIB_CFLAGS was missed in JDK-8345683
2a31f69: 8353331: Test ForkJoinPool20Test::testFixedDelaySequence is failing
1809138: 8352284: EXTRA_CFLAGS incorrectly applied to BUILD_LIBJVM src/hotspot C++ source files
cef5610: 8353272: One instance of STATIC_LIB_CFLAGS was missed in JDK-8345683
6801eb8: 8352709: Remove bad timing annotations from WhileOpTest.java
... and 50 more: https://git.openjdk.org/jdk/compare/58ef4015b7313292a7c7634d3e00e3a904bbdc50...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

openjdk · 2025-03-20T04:47:58Z

@iklam The following labels will be automatically applied to this pull request:

core-libs
hotspot

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

mlbridge · 2025-03-20T04:53:59Z

Webrevs

AlanBateman · 2025-03-24T08:47:29Z

Is the motivation tests or code that is making use of JDK internals? No objection to the change of course, I'm curious why we are doing this.

iklam · 2025-03-24T15:45:21Z

Is the motivation tests or code that is making use of JDK internals? No objection to the change of course, I'm curious why we are doing this.

The motivation is for both testing (e.g., expose the jdk.internal.test.cds.WhiteBox package proposed by JDK-8352528), as well as supporting existing applications that use --add-exports to access JDK internals.

While the use of --add-exports by applications is discouraged, I think the AOT cache should provide the same level of support as when the AOT cache is not used, since the effort for extending this support is quite small.

calvinccheung

Code changes look clean. I just have two minor comments on the tests.

calvinccheung · 2025-03-25T04:12:23Z

test/lib/jdk/test/lib/cds/CDSModulePackager.java

@@ -33,7 +33,6 @@
 import jdk.test.lib.util.FileUtils;
 import jdk.test.lib.cds.CDSJarUtils.JarOptions;

-


This file has no change other than the above blank line deletion.

calvinccheung · 2025-03-25T04:13:30Z

test/hotspot/jtreg/runtime/cds/appcds/jigsaw/ExactOptionMatch.java

+            // (4) Dump = specified twice, Run = specified twice (but in different order)
+            //     Should still be able to use FMG (values are sorted by CDS).


How about add another test case where the values are specified in the same order?

openjdk-notifier · 2025-03-27T20:33:45Z

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout 8352437-aot-class-linking-incompatible-with-add-exports
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

openjdk · 2025-03-27T20:35:15Z

@iklam this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout 8352437-aot-class-linking-incompatible-with-add-exports
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

…h-add-exports

matias9927

Changes and cleanup look good! Thanks!

iklam · 2025-04-02T01:36:44Z

Thanks @calvinccheung and @matias9927 for the review
Passed tiers1-4 and build-tiers5.
/integrate

openjdk · 2025-04-02T01:37:34Z

Going to push as commit 096e70d.
Since your change was applied there have been 62 commits pushed to the master branch:

6970cf6: 8352775: JVM crashes with -XX:AOTMode=create -XX:+UseZGC
afcad8c: 5043343: FileImageInputStream and FileImageOutputStream do not properly track streamPos for RandomAccessFile
6891490: 8353324: Clean up of comments and import after 8319192
07fd666: 8342984: Bump minimum boot jdk to JDK 24
6a46d55: 8353129: CDS ArchiveRelocation tests fail after JDK-8325132
19eabaf: 8353227: JFR: Prepare tests for strong parser validation
564066d: 8353118: Deprecate the use of java.locale.useOldISOCodes system property
a1ab1d8: 8353449: [BACKOUT] One instance of STATIC_LIB_CFLAGS was missed in JDK-8345683
2a31f69: 8353331: Test ForkJoinPool20Test::testFixedDelaySequence is failing
1809138: 8352284: EXTRA_CFLAGS incorrectly applied to BUILD_LIBJVM src/hotspot C++ source files
... and 52 more: https://git.openjdk.org/jdk/compare/58ef4015b7313292a7c7634d3e00e3a904bbdc50...master

Your commit was automatically rebased without conflicts.

openjdk · 2025-04-02T01:37:42Z

@iklam Pushed as commit 096e70d.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

iklam added 5 commits March 19, 2025 14:51

Prototype: support --add-exports in CDS FMG

4ede134

added comments

88b4bd5

added comments

6a95590

8352437: -XX:+AOTClassLinking is not compatible with --add-export

7d50f73

clean up

bfb7997

openjdk bot added hotspot [email protected] core-libs [email protected] labels Mar 20, 2025

Fixed whitespaces

164cd7f

openjdk bot added the rfr Pull request is ready for review label Mar 20, 2025

iklam changed the title ~~8352437: -XX:+AOTClassLinking is not compatible with --add-export~~ 8352437: Support --add-exports with -XX:+AOTClassLinking Mar 24, 2025

calvinccheung reviewed Mar 25, 2025

View reviewed changes

openjdk-notifier bot changed the base branch from pr/24122 to master March 27, 2025 20:33

openjdk bot added merge-conflict Pull request has merge conflict with target branch and removed rfr Pull request is ready for review labels Mar 27, 2025

iklam added 2 commits March 27, 2025 14:43

Merge branch 'master' into 8352437-aot-class-linking-incompatible-wit…

0fe3464

…h-add-exports

@calvinccheung comments

a60a3fa

openjdk bot added rfr Pull request is ready for review and removed merge-conflict Pull request has merge conflict with target branch labels Mar 27, 2025

matias9927 approved these changes Apr 1, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Apr 1, 2025

openjdk bot added the integrated Pull request has been integrated label Apr 2, 2025

openjdk bot closed this Apr 2, 2025

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 2, 2025

		@@ -33,7 +33,6 @@
		import jdk.test.lib.util.FileUtils;
		import jdk.test.lib.cds.CDSJarUtils.JarOptions;

		// (4) Dump = specified twice, Run = specified twice (but in different order)
		// Should still be able to use FMG (values are sorted by CDS).

8352437: Support --add-exports with -XX:+AOTClassLinking #24124

8352437: Support --add-exports with -XX:+AOTClassLinking #24124

Uh oh!

Conversation

iklam commented Mar 20, 2025 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented Mar 20, 2025

Uh oh!

openjdk bot commented Mar 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openjdk bot commented Mar 20, 2025

Uh oh!

mlbridge bot commented Mar 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

AlanBateman commented Mar 24, 2025

Uh oh!

iklam commented Mar 24, 2025

Uh oh!

calvinccheung left a comment

Choose a reason for hiding this comment

Uh oh!

calvinccheung Mar 25, 2025

Choose a reason for hiding this comment

Uh oh!

iklam Mar 27, 2025

Choose a reason for hiding this comment

Uh oh!

calvinccheung Mar 25, 2025

Choose a reason for hiding this comment

Uh oh!

iklam Mar 27, 2025

Choose a reason for hiding this comment

Uh oh!

openjdk-notifier bot commented Mar 27, 2025

Uh oh!

openjdk bot commented Mar 27, 2025

Uh oh!

matias9927 left a comment

Choose a reason for hiding this comment

Uh oh!

iklam commented Apr 2, 2025

Uh oh!

openjdk bot commented Apr 2, 2025

Uh oh!

openjdk bot commented Apr 2, 2025

Uh oh!

Uh oh!

iklam commented Mar 20, 2025 •

edited by openjdk bot

Loading

openjdk bot commented Mar 20, 2025 •

edited

Loading

mlbridge bot commented Mar 20, 2025 •

edited

Loading