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

8316130: Incorrect control in LibraryCallKit::inline_native_notify_jvmti_funcs #15713

Closed
wants to merge 2 commits into from

Conversation

TobiHartmann
Copy link
Member

@TobiHartmann TobiHartmann commented Sep 13, 2023

We hit an assert during loop opts because the control input fed into must_be_not_null in LibraryCallKit::inline_native_notify_jvmti_funcs is wrong. The problem is that control is obtained from the GraphKit while it's been updated via the IdealKit. I simply moved the must_be_not_null out of the if branch and to before IdealKit creation, similar to what we do for other intrinsics.

The original reproducer requires JFR and changes to core libraries (see JBS for details) and I was not able to extract a standalone reproducer. I don't think it's worth it because the required core libraries changes will be integrated separately and then the existing test will trigger the issue (with JFR).

Thanks,
Tobias


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-8316130: Incorrect control in LibraryCallKit::inline_native_notify_jvmti_funcs (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15713

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 13, 2023

👋 Welcome back thartmann! 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 added the rfr Pull request is ready for review label Sep 13, 2023
@openjdk
Copy link

openjdk bot commented Sep 13, 2023

@TobiHartmann 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 Sep 13, 2023
@mlbridge
Copy link

mlbridge bot commented Sep 13, 2023

Webrevs

Copy link
Contributor

@rwestrel rwestrel 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 to me.

@openjdk
Copy link

openjdk bot commented Sep 14, 2023

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

8316130: Incorrect control in LibraryCallKit::inline_native_notify_jvmti_funcs

Reviewed-by: roland, chagedorn

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

  • edd454b: 8315766: Parallelize gc/stress/TestStressIHOPMultiThread.java test
  • de9b971: 8315933: Serial: Remove empty Generation::ensure_parsability
  • b48dbf6: 8316181: Move the fast locking implementation out of the .ad files
  • 8f4dfc4: 8316164: Opensource JMenuBar manual test
  • 33c62e4: 8316154: Opensource JTextArea manual tests
  • 14408bc: 8315973: Remove unused fields from ThreadLocalRandom
  • 903b9e8: 8316199: Remove sun/tools/jstatd/TestJstatd* tests from problemlist for Windows.
  • 639ba13: 8316179: Use consistent naming for lightweight locking in MacroAssembler
  • 11d431b: 8316228: jcmd tests are broken by 8314828
  • eb37c7e: 8315971: ProblemList containers/docker/TestMemoryAwareness.java on linux-all
  • ... and 9 more: https://git.openjdk.org/jdk/compare/f804f8652da71b18cc654c08c12d07d6fd43c2a7...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 Sep 14, 2023
@TobiHartmann
Copy link
Member Author

Thanks for the review, Roland!

Copy link
Member

@chhagedorn chhagedorn left a comment

Choose a reason for hiding this comment

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

I think you can then remove vt_oop in the else branch which now shadows the outside vt_oop. I guess it is correct to have must_be_not_null() for both branches.

@TobiHartmann
Copy link
Member Author

Good catch, Christian! Fixed.

Copy link
Member

@chhagedorn chhagedorn 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!

@TobiHartmann
Copy link
Member Author

Thanks, Christian!

@TobiHartmann
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Sep 22, 2023

Going to push as commit 4b65483.
Since your change was applied there have been 154 commits pushed to the master branch:

  • 7352bb9: 8316418: containers/docker/TestMemoryWithCgroupV1.java get OOM killed with Parallel GC
  • 343cc0c: 8315576: compiler/codecache/CodeCacheFullCountTest.java fails after JDK-8314837
  • fe86263: 8316319: Generational ZGC: The SoftMaxHeapSize might be wrong when CDS decreases the MaxHeapSize
  • 775e22a: 8316699: TestDynamicConstant.java fails with release VMs
  • a1e0346: 8316698: build failure caused by JDK-8316456
  • c72f004: 8316456: StackWalker may skip Continuation::yield0 frame mistakenly
  • 041510d: 8315486: vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn002/forceEarlyReturn002.java timed out
  • ef49e6c: 8316629: j.text.DateFormatSymbols setZoneStrings() exception is unhelpful
  • 496264c: 8316435: sun.util.calendar.CalendarSystem subclassing should be restricted
  • 1100dbc: 8316695: ProblemList serviceability/jvmti/RedefineClasses/RedefineLeakThrowable.java
  • ... and 144 more: https://git.openjdk.org/jdk/compare/f804f8652da71b18cc654c08c12d07d6fd43c2a7...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 22, 2023

@TobiHartmann Pushed as commit 4b65483.

💡 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
hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated
3 participants