-
Notifications
You must be signed in to change notification settings - Fork 138
8373442: [lworld] Fix CDS heap dumping crashes #1784
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
|
👋 Welcome back coleenp! A progress list of the required criteria for merging this PR into |
|
@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: 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
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 |
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(); |
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.
Why is Arguments::enable_preview() check necessary here but not in aotMappedHeapWriter.cpp?
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.
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.
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.
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.
…lass element type is not supported.
matias9927
left a comment
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.
LGTM, thanks!
|
Thanks for reviewing Ioi and Matias. |
|
Going to push as commit cf0c0c0.
Your commit was automatically rebased without conflicts. |
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
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/valhalla.git pull/1784/head:pull/1784$ git checkout pull/1784Update a local copy of the PR:
$ git checkout pull/1784$ git pull https://git.openjdk.org/valhalla.git pull/1784/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 1784View PR using the GUI difftool:
$ git pr show -t 1784Using diff file
Download this PR as a diff file:
https://git.openjdk.org/valhalla/pull/1784.diff
Using Webrev
Link to Webrev Comment