8384608: [lworld] Sync preview jimage overlay implementation with mainline 8377070#2436
Draft
xuemingshen-oracle wants to merge 2 commits into
Draft
8384608: [lworld] Sync preview jimage overlay implementation with mainline 8377070#2436xuemingshen-oracle wants to merge 2 commits into
xuemingshen-oracle wants to merge 2 commits into
Conversation
|
👋 Welcome back sherman! A progress list of the required criteria for merging this PR into |
|
❗ This change is not yet ready to be integrated. |
# Conflicts: # src/java.base/share/classes/jdk/internal/jimage/ImageReader.java # src/java.base/share/classes/jdk/internal/jimage/ModuleLink.java # src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImageResourcesTree.java # test/jdk/jdk/internal/jimage/ImageLocationTest.java # test/jdk/jdk/internal/jimage/ModuleLinkTest.java # test/jdk/tools/jlink/whitebox/jdk.jlink/jdk/tools/jlink/internal/ImageResourcesTreeTest.java
Author
|
After the jdk27->lworld merge (8377070 the change appears to be trivial. It might not be worth doing in lworld, we might just make the change directly in mainline. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
JDK27 Mainline has integrated 8377070: Update jimage format to support classes compiled with preview feature enabled, which provides the core packaged-jimage preview overlay infrastructure: jimage format v1.1, preview flags in ImageLocation, Java ImageReader support, native libjimage support, HotSpot class loader hook points, raw ResourceEntries for jlink, and updated tests.
Valhalla lworld already contains an earlier version of this work plus additional Valhalla-specific follow-ups, including preview activation, exploded-image support, javac preview platform plumbing, and make-time staging of value-class preview resources. However, the mainline integration renamed/refined some APIs and implementation details during migration. We should sync the generic mainline changes back into lworld without regressing the Valhalla-only enablement work.
Todo List
Non-Goals
Do not overwrite or regress Valhalla-specific preview-resource behavior. In particular, preserve Valhalla’s existing runtime preview activation, exploded-image overlay support, javac preview lookup plumbing, and make-time META-INF/preview staging for value-class variants.
Testing
Progress
Issue
Backport <hash>with the hash of the original commit. See Backports.Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/valhalla.git pull/2436/head:pull/2436$ git checkout pull/2436Update a local copy of the PR:
$ git checkout pull/2436$ git pull https://git.openjdk.org/valhalla.git pull/2436/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 2436View PR using the GUI difftool:
$ git pr show -t 2436Using diff file
Download this PR as a diff file:
https://git.openjdk.org/valhalla/pull/2436.diff