8267773: PhaseStringOpts::int_stringSize doesn't handle min_jint correctly #4255

neliasso · 2021-05-28T20:56:54Z

Hi,

PhaseStringOpts::int_stringSize doesn't handle min_jint correctly - it can't be negated to a positive number. I fix this adding a special case for this.

Added a test that was contributed by Adam who reported the bug. Will add as a contributor.

Please review,
Best regards,
Nils Eliasson

Progress

Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed

Issue

JDK-8267773: PhaseStringOpts::int_stringSize doesn't handle min_jint correctly

Reviewers

Roland Westrelin (@rwestrel - Reviewer) ⚠️ Review applies to da17bb3

Contributors

Adam Farley <afarley@openjdk.org>
Aleksey Shipilev <shade@openjdk.org>
Nils Eliasson <neliasso@openjdk.org>

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/4255/head:pull/4255
$ git checkout pull/4255

Update a local copy of the PR:
$ git checkout pull/4255
$ git pull https://git.openjdk.java.net/jdk pull/4255/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4255

View PR using the GUI difftool:
$ git pr show -t 4255

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/4255.diff

bridgekeeper · 2021-05-28T20:57:14Z

👋 Welcome back neliasso! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2021-05-28T20:59:43Z

@neliasso The following label will be automatically applied to this pull request:

hotspot-compiler

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.

neliasso · 2021-05-28T21:01:37Z

/contributor add afarley

openjdk · 2021-05-28T21:01:52Z

@neliasso
Contributor Adam Farley <afarley@openjdk.org> successfully added.

mlbridge · 2021-05-28T21:08:41Z

Webrevs

01: Full - Incremental (43125189)
00: Full (da17bb36)

rwestrel

Looks ok to me.

openjdk · 2021-05-31T07:03:20Z

@neliasso 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:

8267773: PhaseStringOpts::int_stringSize doesn't handle min_jint correctly

Co-authored-by: Adam Farley <afarley@openjdk.org>
Co-authored-by: Aleksey Shipilev <shade@openjdk.org>
Co-authored-by: Nils Eliasson <neliasso@openjdk.org>
Reviewed-by: roland

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 34 new commits pushed to the master branch:

ccfcd92: 8180571: Refactor sun/security/pkcs11 shell tests to plain java tests and fix failures
40e4171: 8264800: cleanup Threads_lock comments in JVM/TI function headers
b17b11e: 8267562: G1: Missing BOT in Open Archive regions causes long pauses
2b33835: 8265148: StackWatermarkSet being updated during AsyncGetCallTrace
64ba2f0: 8265431: Add -fno-delete-null-pointer-checks to clang builds
d4b4cae: 8268023: Improve diagnostic for HandshakeFailureTest
9d8ad2e: 8267990: Revisit some uses of synchronized in the HttpClient API
36dc268: 8268036: ProblemList gtest/AsyncLogGtest.java
74b70a5: 8036580: CHA: improve default method support
20479c3: 8065760: CHA: Improve abstract method support
... and 24 more: https://git.openjdk.java.net/jdk/compare/964bac9e38460df4bd1ad9d25136d5e9743028dd...master

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 master branch, type /integrate in a new comment.

shipilev

Huh, I found a similar issue with fuzzer tests this weekend. I minimized this to string concat bug as well, here is the test that I have: https://cr.openjdk.java.net/~shade/scratch/8267773.patch -- feel free to merge it here.

test/hotspot/jtreg/compiler/stringopts/TestFetchStaticField.java

neliasso · 2021-05-31T15:02:24Z

/contributor add shipilev

openjdk · 2021-05-31T15:02:47Z

@neliasso Could not parse shipilev as a valid contributor.
Syntax: /contributor (add|remove) [@user | openjdk-user | Full Name <email@address>]. For example:

/contributor add @openjdk-bot
/contributor add duke
/contributor add J. Duke <duke@openjdk.org>

neliasso · 2021-05-31T15:02:53Z

Looks ok to me.

Thank you Roland!

shipilev · 2021-05-31T16:10:50Z

My OpenJDK handle is "shade".

neliasso · 2021-05-31T16:52:58Z

/contributor add shade

openjdk · 2021-05-31T16:53:44Z

@neliasso
Contributor Aleksey Shipilev <shade@openjdk.org> successfully added.

mlbridge · 2021-05-31T17:07:54Z

Mailing list message from Nils Eliasson on hotspot-compiler-dev:

Updated.

Thanks for contributing the test!

Best regards,
Nils

On 2021-05-31 18:13, Aleksey Shipilev wrote:

mlbridge · 2021-05-31T17:07:55Z

Mailing list message from Nils Eliasson on hotspot-compiler-dev:

Updated.

Thanks for contributing the test!

Best regards,
Nils

On 2021-05-31 18:13, Aleksey Shipilev wrote:

TobiHartmann

Looks good to me, thanks for fixing!

TobiHartmann

What about the "wrong type in PhaseStringOpts::fetch_static_field" you mentioned in the bug comments?

neliasso · 2021-06-01T08:50:15Z

What about the "wrong type in PhaseStringOpts::fetch_static_field" you mentioned in the bug comments?

It is a left over from a detour. Removed it.

neliasso · 2021-06-01T19:17:25Z

/contributor add neliasso

openjdk · 2021-06-01T19:18:39Z

@neliasso
Contributor Nils Eliasson <neliasso@openjdk.org> successfully added.

neliasso · 2021-06-02T07:55:46Z

/integrate

openjdk · 2021-06-02T07:57:32Z

@neliasso Since your change was applied there have been 44 commits pushed to the master branch:

496fb90: 8267969: Add vectorized implementation for VectorMask.eq()
1cea6ca: 8260360: IGV: Short name of combined nodes is hidden by background color
7530c00: 8266559: XPathEvaluationResult.XPathResultType.NODESET maps to incorrect type
b98e52a: 8267570: The comment of the class JavacParser is not appropriate
379376f: 8265130: Make ConstantDesc class hierarchy sealed
00c7aee: 8267861: Update SourceVersion with new language features in 16 and 17
cb7128b: 8266950: Remove vestigial support for non-strict floating-point execution
8624cb5: 8266530: HotSpot changes for JEP 306
0ae4ceb: 8244146: javac changes for JEP 306
c2c0208: 8267089: Use typedef KVHashtable for ID2KlassTable
... and 34 more: https://git.openjdk.java.net/jdk/compare/964bac9e38460df4bd1ad9d25136d5e9743028dd...master

Your commit was automatically rebased without conflicts.

Pushed as commit d47a77d.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Fix overflow in strconcat

da17bb3

openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label May 28, 2021

neliasso marked this pull request as ready for review May 28, 2021 21:03

openjdk bot added the rfr Pull request is ready for review label May 28, 2021

rwestrel approved these changes May 31, 2021

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label May 31, 2021

shipilev reviewed May 31, 2021

View reviewed changes

test/hotspot/jtreg/compiler/stringopts/TestFetchStaticField.java Outdated Show resolved Hide resolved

test/hotspot/jtreg/compiler/stringopts/TestFetchStaticField.java Outdated Show resolved Hide resolved

Nils Eliasson added 2 commits May 31, 2021 14:53

Add and fix test

af28ac4

Remove test

4312518

TobiHartmann approved these changes Jun 1, 2021

View reviewed changes

TobiHartmann reviewed Jun 1, 2021

View reviewed changes

openjdk bot closed this Jun 2, 2021

openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 2, 2021

8267773: PhaseStringOpts::int_stringSize doesn't handle min_jint correctly #4255

8267773: PhaseStringOpts::int_stringSize doesn't handle min_jint correctly #4255

Uh oh!

Conversation

neliasso commented May 28, 2021 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Contributors

Reviewing

Uh oh!

bridgekeeper bot commented May 28, 2021

Uh oh!

openjdk bot commented May 28, 2021

Uh oh!

neliasso commented May 28, 2021

Uh oh!

openjdk bot commented May 28, 2021

Uh oh!

mlbridge bot commented May 28, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

rwestrel left a comment

Choose a reason for hiding this comment

Uh oh!

openjdk bot commented May 31, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

shipilev left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

neliasso commented May 31, 2021

Uh oh!

openjdk bot commented May 31, 2021

Uh oh!

neliasso commented May 31, 2021

Uh oh!

shipilev commented May 31, 2021

Uh oh!

neliasso commented May 31, 2021

Uh oh!

openjdk bot commented May 31, 2021

Uh oh!

mlbridge bot commented May 31, 2021

Uh oh!

mlbridge bot commented May 31, 2021

Uh oh!

TobiHartmann left a comment

Choose a reason for hiding this comment

Uh oh!

TobiHartmann left a comment

Choose a reason for hiding this comment

Uh oh!

neliasso commented Jun 1, 2021

Uh oh!

neliasso commented Jun 1, 2021

Uh oh!

openjdk bot commented Jun 1, 2021

Uh oh!

neliasso commented Jun 2, 2021

Uh oh!

openjdk bot commented Jun 2, 2021

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

4 participants

neliasso commented May 28, 2021 •

edited by openjdk bot

Loading

mlbridge bot commented May 28, 2021 •

edited

Loading

openjdk bot commented May 31, 2021 •

edited

Loading