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

8290534: Move MacroAssembler::verified_entry to C2_MacroAssembler on x86 #9558

Closed
wants to merge 2 commits into from

Conversation

fisk
Copy link
Contributor

@fisk fisk commented Jul 19, 2022

The MacroAssembler::verified_entry method is a C2 function. It belongs in C2_MacroAssembler. This patch moves it there on x86.


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-8290534: Move MacroAssembler::verified_entry to C2_MacroAssembler on x86

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9558

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 19, 2022

👋 Welcome back eosterlund! 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 Jul 19, 2022
@openjdk
Copy link

openjdk bot commented Jul 19, 2022

@fisk 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 Jul 19, 2022
@mlbridge
Copy link

mlbridge bot commented Jul 19, 2022

Webrevs

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.

Looks fine.

I have not verified the move was line-to-line exact, but I assume that was a mechanical copy-paste.

@openjdk
Copy link

openjdk bot commented Jul 19, 2022

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

8290534: Move MacroAssembler::verified_entry to C2_MacroAssembler on x86

Reviewed-by: shade, 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 162 new commits pushed to 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 Pull request is ready to be integrated label Jul 19, 2022
@fisk
Copy link
Contributor Author

fisk commented Jul 19, 2022

Looks fine.

I have not verified the move was line-to-line exact, but I assume that was a mechanical copy-paste.

Thanks @shipilev. It was indeed a mechanical copy-paste. Does that make it... trivial? :o

@shipilev
Copy link
Member

Thanks @shipilev. It was indeed a mechanical copy-paste. Does that make it... trivial? :o

Let's see what GHA says about that! Declarations/definitions move might yield surprise build failures.

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.

Changes are good.

@fisk
Copy link
Contributor Author

fisk commented Jul 19, 2022

Thanks for the review, @vnkozlov !

@fisk
Copy link
Contributor Author

fisk commented Jul 20, 2022

GHA seems happy. Thanks for the review, everyone. Time to /integrate

@fisk
Copy link
Contributor Author

fisk commented Jul 20, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Jul 20, 2022

Going to push as commit 43c47b1.
Since your change was applied there have been 186 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 Jul 20, 2022
@openjdk openjdk bot closed this Jul 20, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jul 20, 2022
@openjdk
Copy link

openjdk bot commented Jul 20, 2022

@fisk Pushed as commit 43c47b1.

💡 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
hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated
3 participants