-
Notifications
You must be signed in to change notification settings - Fork 5.7k
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
8338661: StackMapTable is invalid if frames appear in dead code #20644
Conversation
…tructions
👋 Welcome back asotona! A progress list of the required criteria for merging this PR into |
@asotona 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 no new commits pushed to the ➡️ To integrate this PR with the above commit message to the |
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.
Looks good to me.
The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork: git checkout JDK-8338661-stack-counter
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push |
…counter # Conflicts: # test/jdk/jdk/classfile/StackMapsTest.java
/integrate |
Going to push as commit e88a3b0.
Your commit was automatically rebased without conflicts. |
ClassFile API allows to build a class with dead code and provide custom
StackMapTable
attribute with user-specified frames covering the dead code.StackCounter
is responsible for calculation ofmaxStack
andmaxLocals
in certain situations and it did not include the user-providedStackMapTable
attribute. Dead code was skipped andmaxStack
ormaxLocals
might became underestimated.This patch includes frames from user-provided
StackMapTable
attribute into theStackCounter
calculations.Please review.
Thanks,
Adam
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/20644/head:pull/20644
$ git checkout pull/20644
Update a local copy of the PR:
$ git checkout pull/20644
$ git pull https://git.openjdk.org/jdk.git pull/20644/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 20644
View PR using the GUI difftool:
$ git pr show -t 20644
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/20644.diff
Webrev
Link to Webrev Comment