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

8278479: RunThese test failure with +UseHeavyMonitors and +VerifyHeavyMonitors #9339

Closed
wants to merge 4 commits into from

Conversation

coleenp
Copy link
Contributor

@coleenp coleenp commented Jun 30, 2022

This change adds a null check before calling into Runtime1::monitorenter when -XX:+UseHeavyMonitors is set. There's a null check in the C2 and interpreter code before calling the runtime function but not C1.

Tested with tier1-7 (a little of 8) and built on most non-oracle platforms as well.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8278479: RunThese test failure with +UseHeavyMonitors and +VerifyHeavyMonitors

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/9339/head:pull/9339
$ git checkout pull/9339

Update a local copy of the PR:
$ git checkout pull/9339
$ git pull https://git.openjdk.org/jdk pull/9339/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9339

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/9339.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 30, 2022

👋 Welcome back coleenp! 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
Copy link

openjdk bot commented Jun 30, 2022

@coleenp 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.

@openjdk openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Jun 30, 2022
@coleenp coleenp marked this pull request as ready for review July 1, 2022 14:06
@coleenp
Copy link
Contributor Author

coleenp commented Jul 1, 2022

/label add hotspot-runtime

@openjdk openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Jul 1, 2022
@openjdk
Copy link

openjdk bot commented Jul 1, 2022

@coleenp
The hotspot-runtime label was successfully added.

@openjdk openjdk bot added the rfr Pull request is ready for review label Jul 1, 2022
@mlbridge
Copy link

mlbridge bot commented Jul 1, 2022

Webrevs

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Choose a reason for hiding this comment

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

Looks good.

@openjdk
Copy link

openjdk bot commented Jul 1, 2022

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

8278479: RunThese test failure with +UseHeavyMonitors and +VerifyHeavyMonitors

Reviewed-by: kvn, dcubed, dlong

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

  • 77c3bbf: 8289617: Remove test/jdk/java/net/ServerSocket/ThreadStop.java
  • a5934cd: 8289698: AArch64: Need to relativize extended_sp in frame
  • fd1bb07: 8287603: Avoid redundant HashMap.containsKey calls in NimbusDefaults.getDerivedColor
  • 4c997ba: 8289520: G1: Remove duplicate checks in G1BarrierSetC1::post_barrier
  • 1b997db: 8289427: compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java failed with null setting
  • 688712f: 8289633: Forbid raw C-heap allocation functions in hotspot and fix findings
  • df063f7: 8289484: Cleanup unnecessary null comparison before instanceof check in java.rmi
  • 9ccae70: 8287593: ShortResponseBody could be made more resilient to rogue connections
  • bad9ffe: 8288947: G1: Consolidate per-region is-humongous query in G1CollectedHeap
  • b5d9656: 8288971: AArch64: Clean up stack and register handling in interpreter
  • ... and 70 more: https://git.openjdk.org/jdk/compare/af0088076dd8cb5d5bc47c59838e7f5ef4f6d8a9...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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jul 1, 2022
Copy link
Member

@dcubed-ojdk dcubed-ojdk left a comment

Choose a reason for hiding this comment

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

The changes look good, but it has been a long time since I've
looked at C1 code so my opinion is rusty...

Thanks for testing with Mach5 Tier[1-7]. Did you do any targeted
testing with -XX:+UseHeavyMonitors and -XX:+VerifyHeavyMonitors
with RunThese?

@coleenp
Copy link
Contributor Author

coleenp commented Jul 1, 2022

Thanks Vladimir and Dan for the quick reviews.
I ran all of the tiers with UseHeavyMonitors on, except I stopped the long running tests in tier8 because they would have failed right away if it was wrong.
The test for NullPointerExceptionMessage directly exercises this code with the options.
RunThese didn't reproduce this bug locally or with several non-local runs but the stack was the same as the NPE test.

@coleenp
Copy link
Contributor Author

coleenp commented Jul 6, 2022

Thanks Dean for the review and improvement.
/integrate

@openjdk
Copy link

openjdk bot commented Jul 6, 2022

Going to push as commit 83a5d59.
Since your change was applied there have been 90 commits pushed to the master branch:

  • cbaf6e8: 8288022: c2: Transform (CastLL (AddL into (AddL (CastLL when possible
  • 8341895: 8289739: Add G1 specific GC breakpoints for testing
  • ac6be16: 8289695: [TESTBUG] TestMemoryAwareness.java fails on cgroups v2 and crun
  • 4ad18cf: 8289730: Deprecated code sample in java.lang.ClassCastException
  • d8f4e97: 8289146: containers/docker/TestMemoryWithCgroupV1.java fails on linux ppc64le machine with missing Memory and Swap Limit output
  • f783244: 8289706: (cs) Avoid redundant TreeMap.containsKey call in AbstractCharsetProvider
  • fafe8b3: 8289604: compiler/vectorapi/VectorLogicalOpIdentityTest.java failed on x86 AVX1 system
  • 3515604: 8280481: Duplicated stubs to interpreter for static calls
  • d48694d: 8283335: Add exists and readAttributesIfExists methods to FileSystemProvider
  • c45d613: 8289687: [JVMCI] bug in HotSpotResolvedJavaMethodImpl.equals
  • ... and 80 more: https://git.openjdk.org/jdk/compare/af0088076dd8cb5d5bc47c59838e7f5ef4f6d8a9...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jul 6, 2022
@openjdk openjdk bot closed this Jul 6, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jul 6, 2022
@openjdk
Copy link

openjdk bot commented Jul 6, 2022

@coleenp Pushed as commit 83a5d59.

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

@coleenp coleenp deleted the heavymonitors branch July 6, 2022 12:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-compiler hotspot-compiler-dev@openjdk.org hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
4 participants