-
Notifications
You must be signed in to change notification settings - Fork 5.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
8329112: Clean up CDS checking of unsupported module options #18492
8329112: Clean up CDS checking of unsupported module options #18492
Conversation
👋 Welcome back iklam! A progress list of the required criteria for merging this PR into |
@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:
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 5 new commits pushed to the
Please see this link for an up-to-date comparison between the source branch of this pull request and the ➡️ To integrate this PR with the above commit message to the |
Webrevs
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've one suggestion. Looks good otherwise.
@@ -1141,6 +1131,7 @@ InstanceKlass* ClassLoader::load_class(Symbol* name, PackageEntry* pkg_entry, bo | |||
} else { | |||
// Exploded build - attempt to locate class in its defining module's location. | |||
assert(_exploded_entries != nullptr, "No exploded build entries present"); | |||
assert(!CDSConfig::is_dumping_archive(), "CDS doesn't support exploded build"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggestion: update the assert comment to "CDS dumping doesn't support exploded build"
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed. Thanks for the review.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, thanks!
…ed-module-options
Thanks @calvinccheung and @matias9927 for the review. |
Going to push as commit 5b05f8e.
Your commit was automatically rebased without conflicts. |
check_unsupported_dumping_module_options()
andhas_unsupported_runtime_module_options()
, since their error messages are about VM options, not system properties.--patch-module
is allowed during dumping. Replace with an assertion that forbids patching when dumping.Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/18492/head:pull/18492
$ git checkout pull/18492
Update a local copy of the PR:
$ git checkout pull/18492
$ git pull https://git.openjdk.org/jdk.git pull/18492/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 18492
View PR using the GUI difftool:
$ git pr show -t 18492
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/18492.diff
Webrev
Link to Webrev Comment