Skip to content

Conversation

@GoeLin
Copy link
Member

@GoeLin GoeLin commented Jun 21, 2023

I backport this for parity with 11.0.20-oracle.


Progress

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

Issue

  • JDK-8303511: C2: assert(get_ctrl(n) == cle_out) during unrolling (Bug - P3)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1973

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 21, 2023

👋 Welcome back goetz! 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 04eb720d03edc37d7e1cb32c909c31c40485d7a8 8303511: C2: assert(get_ctrl(n) == cle_out) during unrolling Jun 21, 2023
@openjdk
Copy link

openjdk bot commented Jun 21, 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 Jun 21, 2023
@openjdk
Copy link

openjdk bot commented Jun 21, 2023

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

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

8303511: C2: assert(get_ctrl(n) == cle_out) during unrolling

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 Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 21, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 21, 2023

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Jun 25, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jun 25, 2023

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

  • 4dd85cb: 8297587: Upgrade JLine to 3.22.0
  • e0b98bc: 8292033: Move jdk.X509Certificate event logic to JCA layer
  • b2e04df: 8289508: Improve test coverage for XPath Axes: ancestor, ancestor-or-self, preceding, and preceding-sibling
  • 7f1047e: 8297955: LDAP CertStore should use LdapName and not String for DNs
  • 4a7557e: 8236045: [TESTBUG] MismatchedWhiteBox test fails with missing WhiteBox$WhiteBoxPermission.class
  • 513732d: 8260934: java/lang/StringBuilder/HugeCapacity.java fails without Compact Strings
  • 817254d: 8249699: java/io/ByteArrayOutputStream/MaxCapacity.java should use @requires instead of @ignore
  • 77837e3: 8251517: [TESTBUG] com/sun/net/httpserver/bugs/B6393710.java does not scale socket timeout
  • e30705e: 8247968: test/jdk/javax/crypto/SecretKeyFactory/security.properties has wrong header
  • 30f0493: 8239007: java/math/BigInteger/largeMemory/ tests should be disabled on 32-bit platforms
  • ... and 5 more: https://git.openjdk.org/jdk11u-dev/compare/6e12eba9a9b29635c136984dc24e9d019dc07560...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 25, 2023

@GoeLin Pushed as commit cc88f4c.

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

1 participant