-
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
8271459: C2: Missing NegativeArraySizeException when creating StringBuilder with negative capacity #5652
Conversation
…uilder with negative capacity
👋 Welcome back chagedorn! A progress list of the required criteria for merging this PR into |
@chhagedorn 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
|
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 reasonable to me.
@chhagedorn 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 208 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 |
Thanks Roland for your review! |
If we hit the uncommontrap - should we recompile without applying strconcat? Or is this code so uncommon that we don't want to add complexity for that case? |
I guess we could do that by changing the UCT from |
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.
That looks good to me given that we check for too_many_traps
in StringConcat::validate_control_flow()
.
Thanks for your review Tobias! Right, that should prevent the application of stringopts again. |
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!
Thanks Nils for your review! |
/integrate |
Going to push as commit 3953e07.
Your commit was automatically rebased without conflicts. |
@chhagedorn Pushed as commit 3953e07. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
Stringopts does not take into account that a negative
int
argument forStringBuilder(int)
results in aNegativeArraySizeException
when optimizing awayStringBuilder
usages into single strings.The suggested fix does the following:
int
argument is always negative.int
argument is positive or negative.I added some IR tests to verify the fix and also ran some standard benchmarks.
I also updated
TestIRMatching
to test the new and updated default regexes.Thanks,
Christian
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/5652/head:pull/5652
$ git checkout pull/5652
Update a local copy of the PR:
$ git checkout pull/5652
$ git pull https://git.openjdk.java.net/jdk pull/5652/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 5652
View PR using the GUI difftool:
$ git pr show -t 5652
Using diff file
Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/5652.diff