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

8293654: Improve SharedRuntime handling of continuation helper out-arguments #10241

Closed
wants to merge 3 commits into from

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Sep 12, 2022

(Found this while adapting current mainline to x86_32 port)

After JDK-8292584, we have gen_continuation_yield() that generates compiled entry, and implicitly uses the defaults for other ones (interpreter, exception). We should be more explicit about these, and verify the generators properly initialized all out-parameters.

I think we are only using interpreter/exception entry in enterContinuation, but not in yield. Notably, exception_offset should be -1 for nmethod::new_native_nmethod to treat it as "no exception handlers".

There a many ways to strengthen this, this PR is the one I like. I can do the symmetric change in aarch64, once we are agree on x86_64 version.

Additional testing:

  • Linux x86_64 fastdebug, hotspot_loom jdk_loom
  • Linux x86_64 fastdebug, tier1

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-8293654: Improve SharedRuntime handling of continuation helper out-arguments

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10241

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

Using diff file

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

Sorry, something went wrong.

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 12, 2022

👋 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 added the rfr Pull request is ready for review label Sep 12, 2022
@openjdk
Copy link

openjdk bot commented Sep 12, 2022

@shipilev 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 12, 2022
@mlbridge
Copy link

mlbridge bot commented Sep 12, 2022

Webrevs

@openjdk
Copy link

openjdk bot commented Sep 13, 2022

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

8293654: Improve SharedRuntime handling of continuation helper out-arguments

Reviewed-by: dlong, kvn

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

  • 7e02039: 8293647: Avoid unnecessary boxing in jdk.hotspot.agent
  • 9039022: 8287394: AArch64: Remove cbuf parameter from far_call/far_jump/trampoline_call
  • 1dc5039: 8293626: AccessFlag::locations(ClassFileFormatVersion cffv) does not throw NPEx when parameter is null
  • 6f2223f: 8288180: C2: VectorPhase must ensure that SafePointNode memory input is a MergeMemNode
  • 725f41f: 8293351: Add second tmp register to aarch64 BarrierSetAssembler::load_at
  • 37234c8: 8291912: Introduce per-allocation target struct for members in G1PLABAllocator
  • 1e1db5d: 8292591: Experimentally add back barrier-less Java thread transitions
  • dfc16e0: 8292302: Windows GetLastError value overwritten by ThreadLocalStorage::thread
  • 8bd79d3: 8170305: URLConnection doesn't handle HTTP/1.1 1xx (informational) messages
  • 9cd3e35: 4834298: JFileChooser.getSelectedFiles() failed with multi-selection and double-click
  • ... and 14 more: https://git.openjdk.org/jdk/compare/37df5f56259429482cfdbe38e8b6256f1efaf9e8...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 13, 2022
@shipilev
Copy link
Member Author

As promised, also added the symmetric AArch64 part. hotspot_loom jdk_loom passes there, running tier1 now.

@shipilev
Copy link
Member Author

I think this one is pretty simple, but any other Reviews?

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.

Good.

@shipilev
Copy link
Member Author

Thank you!

/integrate

@openjdk
Copy link

openjdk bot commented Sep 14, 2022

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

  • 60f59a4: 8293660: Fix frame::sender_for_compiled_frame frame size assert
  • b3461c1: 8293680: PPC64BE build failure after JDK-8293344
  • 7e02039: 8293647: Avoid unnecessary boxing in jdk.hotspot.agent
  • 9039022: 8287394: AArch64: Remove cbuf parameter from far_call/far_jump/trampoline_call
  • 1dc5039: 8293626: AccessFlag::locations(ClassFileFormatVersion cffv) does not throw NPEx when parameter is null
  • 6f2223f: 8288180: C2: VectorPhase must ensure that SafePointNode memory input is a MergeMemNode
  • 725f41f: 8293351: Add second tmp register to aarch64 BarrierSetAssembler::load_at
  • 37234c8: 8291912: Introduce per-allocation target struct for members in G1PLABAllocator
  • 1e1db5d: 8292591: Experimentally add back barrier-less Java thread transitions
  • dfc16e0: 8292302: Windows GetLastError value overwritten by ThreadLocalStorage::thread
  • ... and 16 more: https://git.openjdk.org/jdk/compare/37df5f56259429482cfdbe38e8b6256f1efaf9e8...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 14, 2022

@shipilev Pushed as commit 2baf251.

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

@shipilev shipilev deleted the JDK-8293654-loom-out branch September 14, 2022 07:23
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
Development

Successfully merging this pull request may close these issues.

None yet

3 participants