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

8340313: Crash due to invalid oop in nmethod after C1 patching #1284

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Dec 23, 2024

I backport this for parity with 21.0.7-oracle.

I had to do trivial resolves:

src/hotspot/cpu/riscv/nativeInst_riscv.cpp
The first lock to be changed already uses CodeCache_lock.

src/hotspot/share/runtime/mutexLocker.cpp/hpp
Resolved due to context


Progress

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

Issue

  • JDK-8340313: Crash due to invalid oop in nmethod after C1 patching (Bug - P2 - Approved)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk21u-dev.git pull/1284/head:pull/1284
$ git checkout pull/1284

Update a local copy of the PR:
$ git checkout pull/1284
$ git pull https://git.openjdk.org/jdk21u-dev.git pull/1284/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1284

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u-dev/pull/1284.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 23, 2024

👋 Welcome back goetz! 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 Dec 23, 2024

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

8340313: Crash due to invalid oop in nmethod after C1 patching

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

  • 8a5bbfe: 8335468: [XWayland] JavaFX hangs when calling java.awt.Robot.getPixelColor
  • 4474fbc: 8342609: jpackage test helper function incorrectly removes a directory instead of its contents only
  • 2f89954: 8339883: Open source several AWT/2D related tests
  • d4c5d69: 8321818: vmTestbase/nsk/stress/strace/strace015.java failed with 'Cannot read the array length because "" is null'
  • 36b067c: 8345414: Google CAInterop test failures
  • 182e949: 8342602: Remove JButton/PressedButtonRightClickTest test
  • fe9284a: 8343101: Rework BasicTest.testTemp test cases
  • 85e5a5c: 8335288: SunPKCS11 initialization will call C_GetMechanismInfo on unsupported mechanisms
  • bf86b34: 8328553: Get rid of JApplet in test/jdk/sanity/client/lib/SwingSet2/src/DemoModule.java
  • 173c3d3: 8333647: C2 SuperWord: some additional PopulateIndex tests
  • ... and 4 more: https://git.openjdk.org/jdk21u-dev/compare/c7c7280f6e25fb68950bad93aa20a96cfc9f35b3...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 changed the title Backport 58d39c317e332fda994f66529fcd1a0ea0e53151 8340313: Crash due to invalid oop in nmethod after C1 patching Dec 23, 2024
@openjdk
Copy link

openjdk bot commented Dec 23, 2024

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 Dec 23, 2024
@mlbridge
Copy link

mlbridge bot commented Dec 23, 2024

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Dec 24, 2024

GHA failure: Twice well konwn wget issue, unrelated.

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.

@openjdk
Copy link

openjdk bot commented Dec 27, 2024

⚠️ @GoeLin This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Dec 27, 2024
@GoeLin
Copy link
Member Author

GoeLin commented Dec 30, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Dec 30, 2024

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

  • 60bf039: 8332158: [XWayland] test/jdk/java/awt/Mouse/EnterExitEvents/ResizingFrameTest.java
  • ff7e184: 8328558: Convert javax/swing/JCheckBox/8032667/bug8032667.java applet test to main
  • cf36052: 8315825: Open some swing tests
  • 3b8d404: 8313905: Checked_cast assert in CDS compare_by_loader
  • 8a5bbfe: 8335468: [XWayland] JavaFX hangs when calling java.awt.Robot.getPixelColor
  • 4474fbc: 8342609: jpackage test helper function incorrectly removes a directory instead of its contents only
  • 2f89954: 8339883: Open source several AWT/2D related tests
  • d4c5d69: 8321818: vmTestbase/nsk/stress/strace/strace015.java failed with 'Cannot read the array length because "" is null'
  • 36b067c: 8345414: Google CAInterop test failures
  • 182e949: 8342602: Remove JButton/PressedButtonRightClickTest test
  • ... and 8 more: https://git.openjdk.org/jdk21u-dev/compare/c7c7280f6e25fb68950bad93aa20a96cfc9f35b3...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Dec 30, 2024

@GoeLin Pushed as commit d912330.

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

@GoeLin GoeLin deleted the goetz_backport_8340313 branch December 30, 2024 22:32
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
Development

Successfully merging this pull request may close these issues.

2 participants