-
Notifications
You must be signed in to change notification settings - Fork 5.8k
8302158: PPC: test/jdk/jdk/internal/vm/Continuation/Fuzz.java: AssertionError: res: false shouldPin: false #12557
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 rrich! A progress list of the required criteria for merging this PR into |
Webrevs
|
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
@@ -3090,6 +3090,11 @@ void SharedRuntime::generate_deopt_blob() { | |||
|
|||
// stack: (caller_of_deoptee, ...). | |||
|
|||
// Freezing continuation frames requires that the caller is trimmed to unextended sp if compiled. | |||
Register caller_sp = R23_tmp3; |
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.
Can the caller be interpreted? I.e., not compiled?
Then it might be helpful to comment like
// If not compiled this contains sp() resulting in a resize of 0.
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 it can be interpreted. I've extended the comment for this case.
@reinrich 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 49 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 |
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 for fixing!
src/hotspot/cpu/ppc/frame_ppc.cpp
Outdated
@@ -421,8 +421,12 @@ void frame::describe_pd(FrameValues& values, int frame_no) { | |||
#endif | |||
|
|||
intptr_t *frame::initial_deoptimization_info() { | |||
// unused... but returns fp() to minimize changes introduced by 7087445 | |||
return fp(); | |||
// `this` is the caller of the deoptee. We want to trimm it, if compiled, to |
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.
I believe "to trim" should contain only one 'm' in English.
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.
Thanks!
Thanks for the reviews! /integrate |
Going to push as commit b8c9d6c.
Your commit was automatically rebased without conflicts. |
This fixes the linked issue by trimming the caller of a frame to be deoptimized back to its
unextended_sp
iff it is compiled. The creation of the sectiondead after deoptimization
shown in the attachment yield_after_deopt_failure.log is prevented by this.A new mode is added to the test BasicExt.java where all frames are deoptimized after a yield operation. The issue can be deterministically reproduced with the new mode. It's not worth to execute all test cases with the new mode though. Instead
ContinuationCompiledFramesWithStackArgs_3c4
is always executed a 2nd time in this mode.Before this BasicExt.java was refactored for better argument processing and representation of the test modes.
Also the try-catch-clause in the main method had to be changed to rethrow the caught exception because without this the test would have succeeded.
Testing: jtreg tests tier 1-4 on standard platforms and also on ppc64le.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/12557/head:pull/12557
$ git checkout pull/12557
Update a local copy of the PR:
$ git checkout pull/12557
$ git pull https://git.openjdk.org/jdk pull/12557/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 12557
View PR using the GUI difftool:
$ git pr show -t 12557
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/12557.diff