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

8323243: JNI invocation of an abstract instance method corrupts the stack #202

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Jan 22, 2024

Clean backport to fix the JNI corner case. Looks simple and safe.

Additional testing:

  • New regression test fails without the fix and passes with it
  • Linux AArch64 server fastdebug, tier{1,2,3,4}

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8323243 needs maintainer approval

Issue

  • JDK-8323243: JNI invocation of an abstract instance method corrupts the stack (Bug - P2 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 202

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 22, 2024

👋 Welcome back shade! 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 71d9a83dece7eb4bdb6ffdd9caf14a1348045ce0 8323243: JNI invocation of an abstract instance method corrupts the stack Jan 22, 2024
@openjdk
Copy link

openjdk bot commented Jan 22, 2024

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

@shipilev shipilev marked this pull request as ready for review January 22, 2024 09:09
@openjdk
Copy link

openjdk bot commented Jan 22, 2024

⚠️ @shipilev 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 the rfr Pull request is ready for review label Jan 22, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 22, 2024

Webrevs

@shipilev
Copy link
Member Author

/approval request Clean backport to fix the JNI corner case. Looks simple and safe. Matches 21.0.3-oracle. Test passes.

@openjdk
Copy link

openjdk bot commented Jan 22, 2024

@shipilev
8323243: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Jan 22, 2024
@openjdk
Copy link

openjdk bot commented Jan 22, 2024

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

8323243: JNI invocation of an abstract instance method corrupts the stack

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

  • ada400c: 8318158: RISC-V: implement roundD/roundF intrinsics
  • 1dd2f2a: 8169475: WheelModifier.java fails by timeout
  • e9be531: 8077371: Binary files in JAXP test should be removed
  • 69416f4: 8318809: java/util/concurrent/ConcurrentLinkedQueue/WhiteBox.java shows intermittent failures on linux ppc64le and aarch64
  • c01bdbb: 8314283: Support for NSS tests on aarch64 platforms
  • c3657ee: 8317771: [macos14] Expand/collapse a JTree using keyboard freezes the application in macOS 14 Sonoma
  • 95e36bc: 8322279: Generational ZGC: Use ZFragmentationLimit and ZYoungCompactionLimit as percentage instead of multiples
  • 6443937: 8323008: filter out harmful -std* flags added by autoconf from CXX
  • c8f0418: 8310031: Parallel: Implement better work distribution for large object arrays in old gen
  • 0d30c8d: 8318590: JButton ignores margin when painting HTML text
  • ... and 17 more: https://git.openjdk.org/jdk21u-dev/compare/95142cf93bb6ac1abe085af51dac91b8e2bd739e...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 ready Pull request is ready to be integrated and removed approval labels Jan 22, 2024
@shipilev
Copy link
Member Author

Push approval granted.

/integrate

@openjdk
Copy link

openjdk bot commented Jan 23, 2024

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

  • d69a097: 8322282: Incorrect LoaderConstraintTable::add_entry after JDK-8298468
  • 8084244: 8316319: Generational ZGC: The SoftMaxHeapSize might be wrong when CDS decreases the MaxHeapSize
  • 2697a9d: 8318696: Do not use LFS64 symbols on Linux
  • 1f9b03e: 8319128: sun/security/pkcs11 tests fail on OL 7.9 aarch64
  • be8733b: 8319213: Compatibility.java reads both stdout and stderr of JdkUtils
  • fae1a03: 8312416: Tests in Locale should have more descriptive names
  • ada400c: 8318158: RISC-V: implement roundD/roundF intrinsics
  • 1dd2f2a: 8169475: WheelModifier.java fails by timeout
  • e9be531: 8077371: Binary files in JAXP test should be removed
  • 69416f4: 8318809: java/util/concurrent/ConcurrentLinkedQueue/WhiteBox.java shows intermittent failures on linux ppc64le and aarch64
  • ... and 23 more: https://git.openjdk.org/jdk21u-dev/compare/95142cf93bb6ac1abe085af51dac91b8e2bd739e...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 23, 2024

@shipilev Pushed as commit ad2e114.

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

@shipilev shipilev deleted the JDK-8323243-jni-abstract-method-corrupt branch February 7, 2024 15:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
1 participant