Skip to content

Conversation

@coleenp
Copy link
Contributor

@coleenp coleenp commented Dec 10, 2025

This fixes three crashes in when heap dumping is enabled with Matias's patch.
Tested with tier1-3, that doesn't exactly turn on valhalla and some --enable-valhalla testing locally.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed (1 review required, with at least 1 Committer)

Issue

  • JDK-8373442: [lworld] Fix CDS heap dumping crashes (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1784

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/valhalla/pull/1784.diff

Using Webrev

Link to Webrev Comment

@coleenp coleenp marked this pull request as ready for review December 10, 2025 17:23
@bridgekeeper
Copy link

bridgekeeper bot commented Dec 10, 2025

👋 Welcome back coleenp! A progress list of the required criteria for merging this PR into lworld 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 Dec 10, 2025

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

8373442: [lworld] Fix CDS heap dumping crashes

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 120 new commits pushed to the lworld 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 lworld branch, type /integrate in a new comment.

@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 10, 2025
@mlbridge
Copy link

mlbridge bot commented Dec 10, 2025

Webrevs

narrowKlass nk = ArchiveBuilder::current()->get_requested_narrow_klass(src_klass);

markWord mw = markWord::prototype();
markWord mw = Arguments::enable_preview() ? src_klass->prototype_header() : markWord::prototype();
Copy link
Member

Choose a reason for hiding this comment

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

Why is Arguments::enable_preview() check necessary here but not in aotMappedHeapWriter.cpp‎?

Copy link
Contributor Author

@coleenp coleenp Dec 10, 2025

Choose a reason for hiding this comment

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

Yes, these should fail too.
Edit. No they don't fail because they test Universe::objectArrayKlass() which is a default RefArrayKlass and that class doesn't set any special flattening or other bits in the markWord, so markWord::prototype() is okay there. But this code is confusing and fragile and should be rewritten.

Copy link
Contributor Author

@coleenp coleenp Dec 10, 2025

Choose a reason for hiding this comment

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

It should be refactored in mainline now that Valhalla uses Klass::_prototype_header, like COH, we should always use it unconditionally for object allocation. Not for this PR though, this is to get things working.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 11, 2025
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, thanks!

@coleenp
Copy link
Contributor Author

coleenp commented Dec 11, 2025

Thanks for reviewing Ioi and Matias.
/integrate

@openjdk
Copy link

openjdk bot commented Dec 11, 2025

Going to push as commit cf0c0c0.
Since your change was applied there have been 121 commits pushed to the lworld branch:

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Dec 11, 2025

@coleenp Pushed as commit cf0c0c0.

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

@coleenp coleenp deleted the cds-fixes branch December 11, 2025 20:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants