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

8280155: [PPC64, s390] frame size checks are not yet correct #797

Conversation

TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Jan 26, 2022

Backport of JDK-8280155. Applies cleanly except Copyright update.


Progress

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

Issue

  • JDK-8280155: [PPC64, s390] frame size checks are not yet correct

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 797

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 26, 2022

👋 Welcome back mdoerr! A progress list of the required criteria for merging this PR into pr/796 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 f37bfeadcf036a75defc64ad7f4a9f5596cd7407 8280155: [PPC64, s390] frame size checks are not yet correct Jan 26, 2022
@openjdk
Copy link

openjdk bot commented Jan 26, 2022

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

@openjdk openjdk bot added backport rfr labels Jan 26, 2022
@mlbridge
Copy link

mlbridge bot commented Jan 26, 2022

Webrevs

@TheRealMDoerr
Copy link
Contributor Author

TheRealMDoerr commented Jan 26, 2022

/label add clean

@openjdk
Copy link

openjdk bot commented Jan 26, 2022

@TheRealMDoerr
The label clean is not a valid label.
These labels are valid:

@TheRealMDoerr
Copy link
Contributor Author

TheRealMDoerr commented Jan 26, 2022

/clean

@openjdk openjdk bot added the clean label Jan 26, 2022
@openjdk
Copy link

openjdk bot commented Jan 26, 2022

@TheRealMDoerr This backport pull request is now marked as clean

Copy link
Contributor

@RealLucy RealLucy left a comment

The changes look good to me.
Please note that I'm not a idk-updates reviewer.

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/796 to master Feb 10, 2022
@openjdk-notifier
Copy link

openjdk-notifier bot commented Feb 10, 2022

The dependent pull request has now been integrated, and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout 8280155_ppc64_s390_frame_checks
git fetch https://git.openjdk.java.net/jdk11u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Feb 10, 2022

@TheRealMDoerr this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout 8280155_ppc64_s390_frame_checks2
git fetch https://git.openjdk.java.net/jdk11u-dev master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict label Feb 10, 2022
@openjdk
Copy link

openjdk bot commented Feb 10, 2022

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

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

8280155: [PPC64, s390] frame size checks are not yet correct

Reviewed-by: lucy

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 and removed merge-conflict labels Feb 10, 2022
@TheRealMDoerr
Copy link
Contributor Author

TheRealMDoerr commented Feb 10, 2022

Still clean except Copyright.
/integrate

@openjdk
Copy link

openjdk bot commented Feb 10, 2022

Going to push as commit 668c200.

@openjdk openjdk bot added the integrated label Feb 10, 2022
@openjdk openjdk bot closed this Feb 10, 2022
@openjdk openjdk bot removed ready rfr labels Feb 10, 2022
@openjdk
Copy link

openjdk bot commented Feb 10, 2022

@TheRealMDoerr Pushed as commit 668c200.

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

@TheRealMDoerr TheRealMDoerr deleted the 8280155_ppc64_s390_frame_checks2 branch Feb 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated
2 participants