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

8281459: WebKit 613.1 build broken on M1 #730

Closed
wants to merge 1 commit into from

Conversation

arapte
Copy link
Member

@arapte arapte commented Feb 9, 2022

This seems like a bad merge issue.
There were duplicate copies of four methods in MacroAssemblerARM64.h which caused WebKit build failure on Mac M1 machines.
Just removing the methods removes the error.
With the changes in this PR, now the file MacroAssemblerARM64.h matches with the WebKit mainline.


Progress

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

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jfx pull/730/head:pull/730
$ git checkout pull/730

Update a local copy of the PR:
$ git checkout pull/730
$ git pull https://git.openjdk.java.net/jfx pull/730/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 730

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jfx/pull/730.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 9, 2022

👋 Welcome back arapte! 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 Ready for review label Feb 9, 2022
@kevinrushforth
Copy link
Member

/reviewers 2

@openjdk
Copy link

openjdk bot commented Feb 9, 2022

@kevinrushforth
The number of required reviews for this PR is now set to 2 (with at least 1 of role reviewers).

@mlbridge
Copy link

mlbridge bot commented Feb 9, 2022

Webrevs

@johanvos
Copy link
Collaborator

johanvos commented Feb 9, 2022

Thanks for the quick patch.
This looks good om Linux-aarch64 (which suffered from the same issue). I'll do a test on M1 tomorrow.

Copy link
Member

@kevinrushforth kevinrushforth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Tested on macOS aarch64.

Copy link
Collaborator

@johanvos johanvos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirmed that this now builds fine on M1

@openjdk
Copy link

openjdk bot commented Feb 10, 2022

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

8281459: WebKit 613.1 build broken on M1

Reviewed-by: kcr, jvos

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 1 new commit pushed to the master branch:

  • 590033f: 8273336: Clicking a selected cell from a group of selected cells in a TableView clears the selected items list but remains selected

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 Ready to be integrated label Feb 10, 2022
@arapte
Copy link
Member Author

arapte commented Feb 10, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Feb 10, 2022

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

  • 4cf66d9: 8187309: TreeCell must not change tree's data
  • 590033f: 8273336: Clicking a selected cell from a group of selected cells in a TableView clears the selected items list but remains selected

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 10, 2022

@arapte Pushed as commit cdebc6c.

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

@arapte arapte deleted the webkit-mac-arm64-error branch May 10, 2022 07:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated
3 participants