Skip to content
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

Conversation

iklam
Copy link
Member

@iklam iklam commented Mar 26, 2024

  • Renamed the functions to check_unsupported_dumping_module_options() and has_unsupported_runtime_module_options(), since their error messages are about VM options, not system properties.
  • Consolidated the search of unsupported properties into a helper function.
  • Removed obsolete code/comment in classLoader.cpp that suggests that --patch-module is allowed during dumping. Replace with an assertion that forbids patching when dumping.

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-8329112: Clean up CDS checking of unsupported module options (Enhancement - P4)

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

Sorry, something went wrong.

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 26, 2024

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

@openjdk
Copy link

openjdk bot commented Mar 26, 2024

@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:

8329112: Clean up CDS checking of unsupported module options

Reviewed-by: ccheung, 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 5 new commits pushed to the master branch:

  • bf93e77: 8329118: Run MessageFormat additional subformat pattern tests under en_US locale
  • 991e04e: 8327383: Clean up _Stalled and _Spinner fields
  • 4eefda9: 8327779: Remove deprecated internal field sun.security.x509.X509Key.key
  • 341dd57: 8325883: Move Monitor Deflation reporting out of safepoint cleanup
  • 7ac2f91: 8329210: Delete Redundant Printer Dialog Modality Test

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 openjdk bot added the rfr Pull request is ready for review label Mar 26, 2024
@openjdk
Copy link

openjdk bot commented Mar 26, 2024

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

  • hotspot-runtime

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

@openjdk openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Mar 26, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 26, 2024

Webrevs

Copy link
Member

@calvinccheung calvinccheung left a 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");
Copy link
Member

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".

Copy link
Member Author

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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 27, 2024
Copy link
Contributor

@matias9927 matias9927 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thanks!

iklam added 2 commits March 28, 2024 09:10
…ed-module-options
@iklam
Copy link
Member Author

iklam commented Mar 29, 2024

Thanks @calvinccheung and @matias9927 for the review.
/integrate

@openjdk
Copy link

openjdk bot commented Mar 29, 2024

Going to push as commit 5b05f8e.
Since your change was applied there have been 9 commits pushed to the master branch:

  • 59c2aff: 8323624: ProviderList.ServiceList does not need to be a list
  • 418deaf: 8328361: Use memset() in method CardTable::dirty_MemRegion()
  • 245514d: 8328953: JEditorPane.read throws ChangedCharSetException
  • df01cc5: 8323576: [Windows] Fallthrough to ::abort instead of os::infinite_sleep for noreturn methods
  • bf93e77: 8329118: Run MessageFormat additional subformat pattern tests under en_US locale
  • 991e04e: 8327383: Clean up _Stalled and _Spinner fields
  • 4eefda9: 8327779: Remove deprecated internal field sun.security.x509.X509Key.key
  • 341dd57: 8325883: Move Monitor Deflation reporting out of safepoint cleanup
  • 7ac2f91: 8329210: Delete Redundant Printer Dialog Modality Test

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Mar 29, 2024
@openjdk openjdk bot closed this Mar 29, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 29, 2024
@openjdk
Copy link

openjdk bot commented Mar 29, 2024

@iklam Pushed as commit 5b05f8e.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

None yet

3 participants