Skip to content

Conversation

@backwaterred
Copy link
Contributor

@backwaterred backwaterred commented May 3, 2023

Backport of this patch to address build errors on xlclang v16 build errors after Harfbuzz upgrade.


Progress

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

Issue

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/1320/head:pull/1320
$ git checkout pull/1320

Update a local copy of the PR:
$ git checkout pull/1320
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/1320/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1320

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/1320.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 3, 2023

👋 Welcome back tsteele! 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 310aa9347861922af5f0311e9e93a5f49dee6adc 8304291: [AIX] Broken build after JDK-8301998 May 3, 2023
@openjdk
Copy link

openjdk bot commented May 3, 2023

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 May 3, 2023
@openjdk
Copy link

openjdk bot commented May 3, 2023

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

8304291: [AIX] Broken build after JDK-8301998

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 37 new commits pushed to the master branch:

  • 31bbf9f: 8306825: Monitor deflation might be accidentally disabled by zero intervals
  • 58c9f6a: 8306774: Make runtime/Monitor/GuaranteedAsyncDeflationIntervalTest.java more reliable
  • 547667d: 8305994: Guarantee eventual async monitor deflation
  • 79aa7b1: 8257856: Make ClassFileVersionsTest.java robust to JDK version updates
  • d8d69f3: 8303508: Vector.lane() gets wrong value on x86
  • 1d7b9ad: 8303069: Memory leak in CompilerOracle::parse_from_line
  • 820030a: 8303564: C2: "Bad graph detected in build_loop_late" after a CMove is wrongly split thru phi
  • 04eb720: 8303511: C2: assert(get_ctrl(n) == cle_out) during unrolling
  • 345e370: 8303861: Error handling step timeouts should never be blocked by OnError and others
  • 5ed9696: 8305481: gtest is_first_C_frame failing on ARM
  • ... and 27 more: https://git.openjdk.org/jdk17u-dev/compare/f969f811a71603f39e4ab42f1362271b7a4d303d...master

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added ready Pull request is ready to be integrated rfr Pull request is ready for review and removed ready Pull request is ready to be integrated labels May 3, 2023
@mlbridge
Copy link

mlbridge bot commented May 3, 2023

Webrevs

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed ready Pull request is ready to be integrated labels May 3, 2023
@backwaterred
Copy link
Contributor Author

I received approval on the jbs issue.

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label May 5, 2023
@openjdk
Copy link

openjdk bot commented May 5, 2023

@backwaterred
Your change (at version 1565b6b) is now ready to be sponsored by a Committer.

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed ready Pull request is ready to be integrated labels May 5, 2023
@TheRealMDoerr
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented May 6, 2023

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

  • 31bbf9f: 8306825: Monitor deflation might be accidentally disabled by zero intervals
  • 58c9f6a: 8306774: Make runtime/Monitor/GuaranteedAsyncDeflationIntervalTest.java more reliable
  • 547667d: 8305994: Guarantee eventual async monitor deflation
  • 79aa7b1: 8257856: Make ClassFileVersionsTest.java robust to JDK version updates
  • d8d69f3: 8303508: Vector.lane() gets wrong value on x86
  • 1d7b9ad: 8303069: Memory leak in CompilerOracle::parse_from_line
  • 820030a: 8303564: C2: "Bad graph detected in build_loop_late" after a CMove is wrongly split thru phi
  • 04eb720: 8303511: C2: assert(get_ctrl(n) == cle_out) during unrolling
  • 345e370: 8303861: Error handling step timeouts should never be blocked by OnError and others
  • 5ed9696: 8305481: gtest is_first_C_frame failing on ARM
  • ... and 27 more: https://git.openjdk.org/jdk17u-dev/compare/f969f811a71603f39e4ab42f1362271b7a4d303d...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 6, 2023

@TheRealMDoerr @backwaterred Pushed as commit fc1d3d3.

💡 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.

2 participants