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

8264016: [JVMCI] add some thread local fields for use by JVMCI #278

Closed
wants to merge 1 commit into from

Conversation

@jerboaa
Copy link
Contributor

@jerboaa jerboaa commented Aug 23, 2021

Please review this JVMCI-related backport for OpenJDK 11u. It adds some thread-local fields and is useful so as to be able to run graal js on stock OpenJDK. The JDK 17 patch didn't apply clean due to context differences, which got fairly trivially resolved.

Testing: test/hotspot/jtreg/compiler/jvmci and manual test using upstream Graal unit test.

Thoughts?


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8264016: [JVMCI] add some thread local fields for use by JVMCI

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/278/head:pull/278
$ git checkout pull/278

Update a local copy of the PR:
$ git checkout pull/278
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/278/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 278

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/278.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Aug 23, 2021

👋 Welcome back sgehwolf! 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 182b11c31aa1d697ed254042c3350330ca3ac6e4 8264016: [JVMCI] add some thread local fields for use by JVMCI Aug 23, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Aug 23, 2021

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

@mlbridge
Copy link

@mlbridge mlbridge bot commented Aug 23, 2021

Webrevs

Copy link
Contributor

@shipilev shipilev left a comment

This looks fine to me. Please try to build without JVMCI too, for extra sanity?

@openjdk
Copy link

@openjdk openjdk bot commented Aug 23, 2021

@jerboaa This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8264016: [JVMCI] add some thread local fields for use by JVMCI

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

  • ba097ca: 8251549: Update docs on building for Git
  • 3a88ae7: Merge
  • 3a32efc: Merge
  • fdbaa23: Merge
  • f4772b5: 8272602: [macos] not all KEY_PRESSED events sent when control modifier is used

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 label Aug 23, 2021
@jerboaa
Copy link
Contributor Author

@jerboaa jerboaa commented Aug 23, 2021

Please try to build without JVMCI too, for extra sanity?

Sure, done. Works fine here :)

@jerboaa
Copy link
Contributor Author

@jerboaa jerboaa commented Aug 25, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Aug 25, 2021

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

  • 3bc2275: 8263776: [JVMCI] add helper to perform Java upcalls
  • 7539e75: 8272700: [macos] Build failure with Xcode 13.0 after JDK-8264848
  • c55b1e5: 8213718: [TEST] Wrong classname in vmTestbase/nsk/stress/except/except002 and except003
  • b3c293c: 8219804: java/net/MulticastSocket/Promiscuous.java fails intermittently due to NumberFormatException
  • fb886e9: 8232782: Shenandoah: streamline post-LRB CAS barrier (aarch64)
  • 5a539db: 8249548: backward focus traversal gets stuck in button group
  • da90fbb: 8265756: AArch64: initialize memory allocated for locals according to Windows AArch64 stack page growth requirement in template interpreter
  • f334c2e: 8263136: C4530 was reported from VS 2019 at access bridge
  • 13ddf0e: 8261072: AArch64: Fix MacroAssembler::get_thread convention
  • 4699467: 8248816: C1: Fix signature conflict in LIRGenerator::strength_reduce_multiply
  • ... and 18 more: https://git.openjdk.java.net/jdk11u-dev/compare/90d529355b0fa36ca3378efae8dc6ba4b5203869...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Aug 25, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Aug 25, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Aug 25, 2021

@jerboaa Pushed as commit 1f6eb0f.

💡 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
2 participants