8322657: CDS filemap fastdebug assert while loading Graal CE Polyglot in isolated classloader #17275

calvinccheung · 2024-01-05T05:08:23Z

Please review this small fix for skipping the non-existent SharedClassPathEntry in FileMapInfo::get_module_shared_path_index.
Please refer to the bug report for more details.

Passed tiers 1 - 4 testing, including the new test.

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-8322657: CDS filemap fastdebug assert while loading Graal CE Polyglot in isolated classloader (Bug - P3)

Reviewers

Matias Saavedra Silva (@matias9927 - Committer) ⚠️ Review applies to 6cf9eaf9
David Holmes (@dholmes-ora - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17275

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

Using diff file

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

Webrev

Link to Webrev Comment

… in isolated classloader

calvinccheung · 2024-01-05T05:08:41Z

/label add hotspot-runtime

bridgekeeper · 2024-01-05T05:09:46Z

👋 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 · 2024-01-05T05:10:13Z

@calvinccheung
The hotspot-runtime label was successfully added.

mlbridge · 2024-01-05T05:13:58Z

Webrevs

01: Full - Incremental (be7a746c)
00: Full (6cf9eaf9)

…assert

stevenschlansker · 2024-01-05T20:45:39Z

Thank you! If all goes well, it'd be nice to have this backported to 22 :)

matias9927

Looks good! If you think it's worth addressing I just have one comment.

matias9927 · 2024-01-08T22:11:38Z

test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/test-classes/DefineModuleApp.java

+public class DefineModuleApp {
+    public static void main(String[] args) throws Throwable {
+        if (args.length != 2) {
+            throw new RuntimeException("DefineModuleApp expects 2 args but saw only " + args.length);


Minor nit: "only" is probably unnecessary in the exception message since you could technically pass more than 2 args.

Thanks. I've removed the "only" in the exception message.

calvinccheung · 2024-01-08T23:03:49Z

Thank you! If all goes well, it'd be nice to have this backported to 22 :)

Sure, we will backport the fix into 22 after it's been integrated and tested in the mainline.

dholmes-ora

Seems fine. Thanks

openjdk · 2024-01-08T23:28:58Z

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

8322657: CDS filemap fastdebug assert while loading Graal CE Polyglot in isolated classloader

Reviewed-by: matsaave, dholmes

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 30 new commits pushed to the master branch:

61ebe3b: 8323032: OptimizedModuleHandlingTest failed in dynamic CDS archive mode
ca9635d: 8322759: Eliminate -Wparentheses warnings in compiler code
8a4dc79: 8274300: Address dsymutil warning by excluding platform specific files
d78e8da: 8322545: Declare newInsets as static in ThemeReader.cpp
24823ba: 8323095: Expand TraceOptoParse block output abbreviations
d47393b: 8320128: Clean up Parse constructor for OSR
387828a: 8322980: Debug agent's dumpThread() API should update thread's name before printing it
c4a83bd: 8323086: Shenandoah: Heap could be corrupted by oom during evacuation
827c71d: 8310190: C2 SuperWord: AlignVector is broken, generates misaligned packs
2acb5bd: 8322790: RISC-V: Tune costs for shuffles with no conversion
... and 20 more: https://git.openjdk.org/jdk/compare/631a9f60f30fe298791aa953fa573001127ff58a...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.

calvinccheung · 2024-01-08T23:52:10Z

Thanks @matias9927 and @dholmes-ora for the reviews.

/integrate

openjdk · 2024-01-08T23:53:12Z

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

61ebe3b: 8323032: OptimizedModuleHandlingTest failed in dynamic CDS archive mode
ca9635d: 8322759: Eliminate -Wparentheses warnings in compiler code
8a4dc79: 8274300: Address dsymutil warning by excluding platform specific files
d78e8da: 8322545: Declare newInsets as static in ThemeReader.cpp
24823ba: 8323095: Expand TraceOptoParse block output abbreviations
d47393b: 8320128: Clean up Parse constructor for OSR
387828a: 8322980: Debug agent's dumpThread() API should update thread's name before printing it
c4a83bd: 8323086: Shenandoah: Heap could be corrupted by oom during evacuation
827c71d: 8310190: C2 SuperWord: AlignVector is broken, generates misaligned packs
2acb5bd: 8322790: RISC-V: Tune costs for shuffles with no conversion
... and 20 more: https://git.openjdk.org/jdk/compare/631a9f60f30fe298791aa953fa573001127ff58a...master

Your commit was automatically rebased without conflicts.

openjdk · 2024-01-08T23:53:19Z

@calvinccheung Pushed as commit 841ab48.

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

calvinccheung · 2024-01-16T22:36:13Z

/backport jdk22

openjdk · 2024-01-16T22:37:22Z

@calvinccheung the backport was successfully created on the branch backport-calvinccheung-841ab487 in my personal fork of openjdk/jdk22. To create a pull request with this backport targeting openjdk/jdk22:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 841ab487 from the openjdk/jdk repository.

The commit being backported was authored by Calvin Cheung on 8 Jan 2024 and was reviewed by Matias Saavedra Silva and David Holmes.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk22:

$ git fetch https://github.com/openjdk-bots/jdk22.git backport-calvinccheung-841ab487:backport-calvinccheung-841ab487
$ git checkout backport-calvinccheung-841ab487
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk22.git backport-calvinccheung-841ab487

8322657: CDS filemap fastdebug assert while loading Graal CE Polyglot…

6cf9eaf

… in isolated classloader

calvinccheung marked this pull request as ready for review January 5, 2024 05:09

openjdk bot added rfr Pull request is ready for review hotspot-runtime hotspot-runtime-dev@openjdk.org labels Jan 5, 2024

Merge branch 'master' of github.com:openjdk/jdk into 8322657-filemap-…

a9690f0

…assert

matias9927 approved these changes Jan 8, 2024

View reviewed changes

comment from Matias

be7a746

dholmes-ora approved these changes Jan 8, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jan 8, 2024

openjdk bot added the integrated Pull request has been integrated label Jan 8, 2024

openjdk bot closed this Jan 8, 2024

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 8, 2024

calvinccheung deleted the 8322657-filemap-assert branch January 8, 2024 23:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8322657: CDS filemap fastdebug assert while loading Graal CE Polyglot in isolated classloader #17275

8322657: CDS filemap fastdebug assert while loading Graal CE Polyglot in isolated classloader #17275

calvinccheung commented Jan 5, 2024 •

edited by openjdk bot

Loading

calvinccheung commented Jan 5, 2024

bridgekeeper bot commented Jan 5, 2024

openjdk bot commented Jan 5, 2024

mlbridge bot commented Jan 5, 2024 •

edited

Loading

stevenschlansker commented Jan 5, 2024

matias9927 left a comment

matias9927 Jan 8, 2024

calvinccheung Jan 8, 2024

calvinccheung commented Jan 8, 2024

dholmes-ora left a comment

openjdk bot commented Jan 8, 2024

calvinccheung commented Jan 8, 2024

openjdk bot commented Jan 8, 2024

openjdk bot commented Jan 8, 2024

calvinccheung commented Jan 16, 2024

openjdk bot commented Jan 16, 2024

8322657: CDS filemap fastdebug assert while loading Graal CE Polyglot in isolated classloader #17275

8322657: CDS filemap fastdebug assert while loading Graal CE Polyglot in isolated classloader #17275

Conversation

calvinccheung commented Jan 5, 2024 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

Webrev

calvinccheung commented Jan 5, 2024

bridgekeeper bot commented Jan 5, 2024

openjdk bot commented Jan 5, 2024

mlbridge bot commented Jan 5, 2024 • edited Loading

Webrevs

stevenschlansker commented Jan 5, 2024

matias9927 left a comment

Choose a reason for hiding this comment

matias9927 Jan 8, 2024

Choose a reason for hiding this comment

calvinccheung Jan 8, 2024

Choose a reason for hiding this comment

calvinccheung commented Jan 8, 2024

dholmes-ora left a comment

Choose a reason for hiding this comment

openjdk bot commented Jan 8, 2024

calvinccheung commented Jan 8, 2024

openjdk bot commented Jan 8, 2024

openjdk bot commented Jan 8, 2024

calvinccheung commented Jan 16, 2024

openjdk bot commented Jan 16, 2024

calvinccheung commented Jan 5, 2024 •

edited by openjdk bot

Loading

mlbridge bot commented Jan 5, 2024 •

edited

Loading