-
Notifications
You must be signed in to change notification settings - Fork 5.6k
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
8317336: Assertion error thrown during 'this' escape analysis #16001
Conversation
👋 Welcome back acobbs! A progress list of the required criteria for merging this PR into |
@archiecobbs 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. |
Webrevs
|
The mistaken assumption was that a lambda body is always a JCBlock. It can also be a JCExpression, in which case it could result in an ExprRef 'this' reference.
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.
looks sensible
@archiecobbs 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 77 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. As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@vicente-romero-oracle) but any other Committer may sponsor as well. ➡️ To flag this PR as ready for integration with the above commit message, type |
/integrate @vicente-romero-oracle, thanks for the reviews. |
@archiecobbs |
/sponsor |
Going to push as commit a8473b7.
Your commit was automatically rebased without conflicts. |
@vicente-romero-oracle @archiecobbs Pushed as commit a8473b7. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
/backport jdk21u |
@archiecobbs the backport was successfully created on the branch archiecobbs-backport-a8473b70 in my personal fork of openjdk/jdk21u. To create a pull request with this backport targeting openjdk/jdk21u:master, just click the following link: The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:
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/jdk21u:
|
The 'this' escape analyzer was assuming that lambas could always be treated like blocks, in the sense that we can assume a block can never end in a plain expression. This assumption is not true for lambda's of the form
() -> foo
which do exactly that. In the case thatfoo
wasthis
, an assertion failure would ensue.This patch explicitly clears any leftover
ExprRef
's after evaluating a lambda body; this restores the asserted invariant when the lambda body is an expression.This also fixes another variant of the same bug caused by certain enhanced
for()
loops. In this case, the leftoverExprRef
was from evaluating the loop expression. This was just a side-effect of the analyzer failing to overrideTreeScanner
to actually assign the loop expression to the loop variable (that will be fixed later in another patch).Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/16001/head:pull/16001
$ git checkout pull/16001
Update a local copy of the PR:
$ git checkout pull/16001
$ git pull https://git.openjdk.org/jdk.git pull/16001/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 16001
View PR using the GUI difftool:
$ git pr show -t 16001
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/16001.diff
Webrev
Link to Webrev Comment