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 #17337

Closed
wants to merge 4 commits into from

Conversation

dholmes-ora
Copy link
Member

@dholmes-ora dholmes-ora commented Jan 10, 2024

See JBS for details.

TL;DR - if an instance method is abstract then JNI front-end should throw AbstractMethodError.

Testing:

  • new regression test
  • tiers 1-3 (sanity)

Thanks.


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-8323243: JNI invocation of an abstract instance method corrupts the stack (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17337

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 10, 2024

👋 Welcome back dholmes! 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 Jan 10, 2024
@openjdk
Copy link

openjdk bot commented Jan 10, 2024

@dholmes-ora The following label will be automatically applied to this pull request:

  • hotspot

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 hotspot-dev@openjdk.org label Jan 10, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 10, 2024

Webrevs

@dholmes-ora
Copy link
Member Author

/label add hotspot-runtime
/label remove hotspot

@openjdk openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Jan 10, 2024
@openjdk
Copy link

openjdk bot commented Jan 10, 2024

@dholmes-ora
The hotspot-runtime label was successfully added.

@openjdk openjdk bot removed the hotspot hotspot-dev@openjdk.org label Jan 10, 2024
@openjdk
Copy link

openjdk bot commented Jan 10, 2024

@dholmes-ora
The hotspot label was successfully removed.

Copy link
Contributor

@coleenp coleenp left a comment

Choose a reason for hiding this comment

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

I have a couple of minor comments but looks good.

@openjdk
Copy link

openjdk bot commented Jan 10, 2024

@dholmes-ora 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

Reviewed-by: coleenp, shade

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

  • 7dc9dd6: 8234502: Merge GenCollectedHeap and SerialHeap
  • ed18222: 8323190: Segfault during deoptimization of C2-compiled code
  • 3e19bf8: 8323529: Relativize test image dependencies in microbenchmarks
  • ba23025: 8322957: Generational ZGC: Relocation selection must join the STS
  • 7c3a39f: 8323297: Fix incorrect placement of precompiled.hpp include lines
  • e72723d: 8323296: java/lang/Thread/virtual/stress/GetStackTraceALotWhenPinned.java#id1 timed out
  • 66520be: 8280056: gtest/LargePageGtests.java#use-large-pages failed "os.release_one_mapping_multi_commits_vm"
  • 82a63a0: 8258979: The image didn't show correctly with GTK LAF
  • 8d9814a: 8322757: Enable -Wparentheses warnings
  • 0ff2dea: 8320673: PageFormat/CustomPaper.java has no Pass/Fail buttons; multiple instructions
  • ... and 68 more: https://git.openjdk.org/jdk/compare/841ab487f83d7e3639d352e796dc7131310c2390...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 Jan 10, 2024
Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

Ouch. Looks good, with minor test suggestion.

@dholmes-ora
Copy link
Member Author

Thanks for the reviews @coleenp and @shipilev !

@shipilev I don't see your "minor test suggestion". ??

Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

This looks good.

Minor nit still: I think we gotta try the Java side first, because that checks the expected behavior. Right now, if JNI fails, we don't really know if that is a product bug (= "JNI failed to throw AME when it should"), or a test bug (= "the way the test is written, even plain Java does not throw AME"). The point of positive test is to verify the test does what it should: if Java test passes and JNI fails, there is a clear indication JNI does something wrong.

Can we also say "Did not get AbstractMethodError from JNI!" and "Did not get AbstractMethodError from Java!" in exception messages, so that it would be abundantly clear which test had failed.

@dholmes-ora
Copy link
Member Author

@shipilev Test updated as suggested.

Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

Excellent, good to go!

@dholmes-ora
Copy link
Member Author

Thanks @shipilev !

/integrate

@dholmes-ora
Copy link
Member Author

/backport jdk22

@openjdk
Copy link

openjdk bot commented Jan 14, 2024

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 14, 2024

@dholmes-ora Pushed as commit 71d9a83.

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

@openjdk
Copy link

openjdk bot commented Jan 14, 2024

@dholmes-ora the backport was successfully created on the branch backport-dholmes-ora-71d9a83d in my personal fork of openjdk/jdk22. To create a pull request with this backport targeting openjdk/jdk22:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 71d9a83d from the openjdk/jdk repository.

The commit being backported was authored by David Holmes on 14 Jan 2024 and was reviewed by Coleen Phillimore and Aleksey Shipilev.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk22:

$ git fetch https://github.com/openjdk-bots/jdk22.git backport-dholmes-ora-71d9a83d:backport-dholmes-ora-71d9a83d
$ git checkout backport-dholmes-ora-71d9a83d
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk22.git backport-dholmes-ora-71d9a83d

@dholmes-ora dholmes-ora deleted the 8323243-jni-abstract branch January 14, 2024 22:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
3 participants