Skip to content

Conversation

@jerboaa
Copy link
Contributor

@jerboaa jerboaa commented Aug 24, 2021

This is a JVMCI related backport for OpenJDK 11. It fixes an issue of a fastdebug JVM asserting when running an upstream graal unit test. Applies clean.


Progress

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

Issue

  • JDK-8261846: [JVMCI] c2v_iterateFrames can get out of sync with the StackFrameStream

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 288

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 24, 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 97e1657ba2424f253cd9a9b51cc7749c72f9b268 8261846: [JVMCI] c2v_iterateFrames can get out of sync with the StackFrameStream Aug 24, 2021
@openjdk
Copy link

openjdk bot commented Aug 24, 2021

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required labels Aug 24, 2021
@openjdk
Copy link

openjdk bot commented Aug 24, 2021

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

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

8261846: [JVMCI] c2v_iterateFrames can get out of sync with the StackFrameStream

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 rfr Pull request is ready for review labels Aug 24, 2021
@mlbridge
Copy link

mlbridge bot commented Aug 24, 2021

Webrevs

@jerboaa
Copy link
Contributor Author

jerboaa commented Aug 25, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Aug 25, 2021

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

  • 1f6eb0f: 8264016: [JVMCI] add some thread local fields for use by JVMCI
  • 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

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Aug 25, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Aug 25, 2021
@openjdk
Copy link

openjdk bot commented Aug 25, 2021

@jerboaa Pushed as commit 09f3707.

💡 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

Labels

backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

1 participant