Skip to content
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

8268347: C2: nested locks optimization may create unbalanced monitor enter/exit code #115

Closed
wants to merge 1 commit into from

Conversation

rwestrel
Copy link
Contributor

@rwestrel rwestrel commented Jul 9, 2021

Original patch does not apply cleanly to 11u because of context is
different in several places. 11u patch is otherwise identical to the
original patch.

Testing: x86_64 build, tier1. Included test case doesn't fail with 11u.


Progress

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

Issue

  • JDK-8268347: C2: nested locks optimization may create unbalanced monitor enter/exit code

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/115/head:pull/115
$ git checkout pull/115

Update a local copy of the PR:
$ git checkout pull/115
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/115/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 115

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/115.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 9, 2021

👋 Welcome back roland! 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 openjdk bot changed the title Backport 4d8b5c70dff51470210a0ca93b932af1b27c9f27 8268347: C2: nested locks optimization may create unbalanced monitor enter/exit code Jul 9, 2021
@openjdk
Copy link

openjdk bot commented Jul 9, 2021

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Jul 9, 2021
@mlbridge
Copy link

mlbridge bot commented Jul 9, 2021

Webrevs

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks for backporting!

@openjdk
Copy link

openjdk bot commented Jul 9, 2021

@rwestrel This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8268347: C2: nested locks optimization may create unbalanced monitor enter/exit code

Reviewed-by: mdoerr

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

  • c44da65: 8268369: SIGSEGV in PhaseCFG::implicit_null_check due to missing null check
  • 2beb7e7: 8218145: block_if_requested is not proper inlined due to size
  • 02c0cf6: 8267424: CTW: C1 fails with "State must not be null"
  • bdf8568: 8250588: Shenandoah: LRB needs to save/restore fp registers for runtime call
  • 1d204c5: 8260589: Crash in JfrTraceIdLoadBarrier::load(_jclass*)
  • c1deb0c: 8213922: fix ctw stand-alone build

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jul 9, 2021
@shipilev
Copy link
Member

shipilev commented Jul 9, 2021

Looks like it needs to be immediately followed with JDK-8269304.

@rwestrel
Copy link
Contributor Author

LGTM. Thanks for backporting!

thanks for the review

@rwestrel
Copy link
Contributor Author

Looks like it needs to be immediately followed with JDK-8269304.

thanks for the heads up. I requested (and got) approval for that one.

@rwestrel
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Jul 15, 2021

Going to push as commit 7a61e03.
Since your change was applied there have been 22 commits pushed to the master branch:

  • 93f952c: 8269882: stack-use-after-scope in NewObjectA
  • c9a8220: 8268620: InfiniteLoopException test may fail on x86 platforms
  • 23918db: 8270184: [TESTBUG] Add coverage for jvmci ResolvedJavaType.toJavaName() for lambdas
  • d4e4828: 8270196: [11u] [JVMCI] JavaType.toJavaName() returns incorrect type name for lambdas
  • 8d1e402: 8265132: C2 compilation fails with assert "missing precedence edge"
  • cbd3b0f: 8267399: C2: java/text/Normalizer/ConformanceTest.java test failed with assertion
  • 09c6af3: 8249899: jdk/javadoc/tool/InlineTagsWithBraces.java uses @ignore w/o bug-id
  • 22a4752: 8268360: Missing check for infinite loop during node placement
  • 1960a05: 8256267: Relax compiler/floatingpoint/NaNTest.java for x86_32 and lower -XX:+UseSSE
  • 6d0945e: 8217825: Verify @AfterTest is used correctly in WebSocket tests
  • ... and 12 more: https://git.openjdk.java.net/jdk11u-dev/compare/d424c0ced4af3dc51aaa329b46c26e4ce9bea6d7...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Jul 15, 2021
@openjdk 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 Jul 15, 2021
@openjdk
Copy link

openjdk bot commented Jul 15, 2021

@rwestrel Pushed as commit 7a61e03.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
3 participants