8385572: [PPC64] frame alignment assertion after JDK-6960970#31309
8385572: [PPC64] frame alignment assertion after JDK-6960970#31309TheRealMDoerr wants to merge 2 commits into
Conversation
|
👋 Welcome back mdoerr! A progress list of the required criteria for merging this PR into |
|
@TheRealMDoerr 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 14 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 |
|
@TheRealMDoerr The following label will be automatically applied to this pull request:
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. |
|
The total number of required reviews for this PR has been set to 2 based on the presence of this label: |
Webrevs
|
|
@offamitkumar: This code should probably also be implemented for s390. |
|
Thanks for the reviews! |
|
Going to push as commit f823e3f.
Your commit was automatically rebased without conflicts. |
|
@TheRealMDoerr Pushed as commit f823e3f. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
|
Is there a description somewhere on what JDK-6960970 changed that affects the alignment? If a compiled frame starts out as aligned, I don't see how deoptimization could change that alignment. Documenting the root cause somewhere would be helpful for future reference. |
|
I suspect the real root cause is that this is a heap frame, but frame::patch_pc() is creating a temporary copy w/o preserving if it is a heap frame or not: jdk/src/hotspot/cpu/ppc/frame_ppc.cpp Line 322 in 0eeacb5 |
Thanks for looking into it! Right, I have proposed a better fix, also for x86 which uses similar code, but doesn't have the alignment assertion: #31330 |
The assertion should also permit deoptimized frames like interpreted frames. They also reach the assertion since JDK-6960970. (See stack trace in JBS issue.)
I've also implemented the missing ppc64 code from that issue. The serviceability/jvmti tests have passed.
Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/31309/head:pull/31309$ git checkout pull/31309Update a local copy of the PR:
$ git checkout pull/31309$ git pull https://git.openjdk.org/jdk.git pull/31309/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 31309View PR using the GUI difftool:
$ git pr show -t 31309Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/31309.diff
Using Webrev
Link to Webrev Comment