Skip to content

8308073: ClassLoaderExt::append_boot_classpath should handle dynamic archive #14127

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

Conversation

calvinccheung
Copy link
Member

@calvinccheung calvinccheung commented May 24, 2023

Please review this simple fix for setting the _has_platform_or_app_classes flag for the dynamic archive case. The flag will be set to false in case the boot class path is appended via JVM TI.
Also adjusting two related JvmtiAddPath.java tests accordingly.

Passed tiers 1 - 4 testing.


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-8308073: ClassLoaderExt::append_boot_classpath should handle dynamic archive

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14127

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

Using diff file

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

Webrev

Link to Webrev Comment

@calvinccheung
Copy link
Member Author

/label add hotspot-runtime

@calvinccheung calvinccheung marked this pull request as ready for review May 24, 2023 16:29
@bridgekeeper
Copy link

bridgekeeper bot commented May 24, 2023

👋 Welcome back ccheung! 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 openjdk bot added rfr Pull request is ready for review hotspot-runtime hotspot-runtime-dev@openjdk.org labels May 24, 2023
@openjdk
Copy link

openjdk bot commented May 24, 2023

@calvinccheung
The hotspot-runtime label was successfully added.

@mlbridge
Copy link

mlbridge bot commented May 24, 2023

Webrevs

Copy link
Member

@iklam iklam left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks for fixing this.

@openjdk
Copy link

openjdk bot commented May 25, 2023

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

8308073: ClassLoaderExt::append_boot_classpath should handle dynamic archive

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

  • 7d2a7ce: 8308672: Add version number in the replay file generated by DumpInline
  • 27ba8bd: 8308108: Support Unicode extension for collation settings
  • 89b3c37: 8307125: compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java hits assert(!Continuation::is_frame_in_continuation(thread(), fr())) failed: No support for deferred values in continuations
  • 98acce1: 8306703: JFR: Summary views
  • 534de6d: 8300491: SymbolLookup::libraryLookup accepts strings with terminators
  • 48d21bd: 8286597: Implement PollerProvider on AIX
  • e7edf8d: 8300038: Make new version of JNU_GetStringPlatformChars which checks for null characters
  • 90e57fd: 8308335: JFR: Remove @experimental from Virtual Threads events
  • 7e2e05d: 8308098: G1: Remove redundant checks in G1ObjectCountIsAliveClosure
  • 2599ada: 8308655: Narrow types of ConstantPool and ConstMethod returns
  • ... and 62 more: https://git.openjdk.org/jdk/compare/8474e693b4404ba62927fe0e43e68b904d66fbde...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 openjdk bot added the ready Pull request is ready to be integrated label May 25, 2023
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.

LGTM!

@calvinccheung
Copy link
Member Author

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

@openjdk
Copy link

openjdk bot commented May 25, 2023

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

  • 4870234: 8304375: jdk/jfr/api/consumer/filestream/TestOrdered.java failed with "Expected at least some events to be out of order! Reuse = false"
  • 7d2a7ce: 8308672: Add version number in the replay file generated by DumpInline
  • 27ba8bd: 8308108: Support Unicode extension for collation settings
  • 89b3c37: 8307125: compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java hits assert(!Continuation::is_frame_in_continuation(thread(), fr())) failed: No support for deferred values in continuations
  • 98acce1: 8306703: JFR: Summary views
  • 534de6d: 8300491: SymbolLookup::libraryLookup accepts strings with terminators
  • 48d21bd: 8286597: Implement PollerProvider on AIX
  • e7edf8d: 8300038: Make new version of JNU_GetStringPlatformChars which checks for null characters
  • 90e57fd: 8308335: JFR: Remove @experimental from Virtual Threads events
  • 7e2e05d: 8308098: G1: Remove redundant checks in G1ObjectCountIsAliveClosure
  • ... and 63 more: https://git.openjdk.org/jdk/compare/8474e693b4404ba62927fe0e43e68b904d66fbde...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 25, 2023

@calvinccheung Pushed as commit dc7683a.

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

@calvinccheung calvinccheung deleted the 8308073-append-bootcp-dynamic-archive branch May 25, 2023 21:58
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.

3 participants