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

8313795: Fix for JDK-8313564 breaks ppc and s390x builds #15165

Closed
wants to merge 1 commit into from

Conversation

RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Aug 4, 2023

The fix for JDK-8313564 breaks the ppc and s390x builds. This should repair it.


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-8313795: Fix for JDK-8313564 breaks ppc and s390x builds (Bug - P1)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15165

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 4, 2023

👋 Welcome back clanger! 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.

@RealCLanger
Copy link
Contributor Author

Ping @coleenp 😄

@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 4, 2023
@openjdk
Copy link

openjdk bot commented Aug 4, 2023

@RealCLanger 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 Aug 4, 2023
@mlbridge
Copy link

mlbridge bot commented Aug 4, 2023

Webrevs

Copy link
Member

@tstuefe tstuefe 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 and trivial.

@openjdk
Copy link

openjdk bot commented Aug 4, 2023

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

8313795: Fix for JDK-8313564 breaks ppc and s390x builds

Reviewed-by: stuefe

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 the ready Pull request is ready to be integrated label Aug 4, 2023
@RealCLanger
Copy link
Contributor Author

Thanks Thomas. Will integrate when GHA is through and confirms that the patch works. Luckily, the cross-build should be repaired by now.

@RealCLanger
Copy link
Contributor Author

GHA looks good. Integrating to unbreak builds.

/integrate

@openjdk
Copy link

openjdk bot commented Aug 4, 2023

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

  • ad6e9e7: 8313554: Fix -Wconversion warnings for ResolvedFieldEntry
  • b463c6d: 8311517: Add performance information to ArrayList javadoc
  • b2add96: 8159527: Collections mutator methods should all be marked as optional operations

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Aug 4, 2023
@openjdk openjdk bot closed this Aug 4, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Aug 4, 2023
@openjdk
Copy link

openjdk bot commented Aug 4, 2023

@RealCLanger Pushed as commit 6d18529.

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

@RealCLanger RealCLanger deleted the JDK-8313795 branch August 4, 2023 22:44
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
Development

Successfully merging this pull request may close these issues.

2 participants