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

8293996: C2: fix and simplify IdealLoopTree::do_remove_empty_loop #1628

Closed
wants to merge 2 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jan 3, 2023

I backport this for parity with 11.0.19-oracle.

Resolved Copyright in test file, will mark as clean.


Progress

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

Issue

  • JDK-8293996: C2: fix and simplify IdealLoopTree::do_remove_empty_loop

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1628

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 3, 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 14c6ac457d319a2e7f9cc9e7355c81c421a065dd 8293998: [PPC64] JfrGetCallTrace: assert(_pc != nullptr) failed: must have PC Jan 3, 2023
@openjdk
Copy link

openjdk bot commented Jan 3, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Jan 3, 2023
@mlbridge
Copy link

mlbridge bot commented Jan 3, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Jan 3, 2023

@GoeLin Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@GoeLin GoeLin changed the title 8293998: [PPC64] JfrGetCallTrace: assert(_pc != nullptr) failed: must have PC Backport dd51f7e0b75d3a16403608d89cd206ac0bedf882 Jan 3, 2023
@openjdk openjdk bot changed the title Backport dd51f7e0b75d3a16403608d89cd206ac0bedf882 8293996: C2: fix and simplify IdealLoopTree::do_remove_empty_loop Jan 3, 2023
@openjdk
Copy link

openjdk bot commented Jan 3, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added the clean label Jan 3, 2023
@openjdk
Copy link

openjdk bot commented Jan 3, 2023

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

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

8293996: C2: fix and simplify IdealLoopTree::do_remove_empty_loop

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 Jan 3, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Jan 4, 2023

Pre-submit failure: Windows build failed. I can not see why. The nightly SAP Win build passed. I restarted the Pre-submit tests to be sure.

@GoeLin
Copy link
Member Author

GoeLin commented Jan 9, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jan 9, 2023

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

  • 80eecc5: 8299439: java/text/Format/NumberFormat/CurrencyFormat.java fails for hr_HR
  • dfcf7c1: 8256111: Create implementation for NSAccessibilityStaticText protocol
  • 06f769a: 8292863: assert(_print_inlining_stream->size() > 0) failed: missing inlining msg
  • 1d78ce4: 8221351: Crash in KlassFactory::check_shared_class_file_load_hook
  • 3c2763f: 8195716: BootstrapLoggerTest : Executor still alive
  • decfc86: 8217353: java/util/logging/LogManager/Configuration/updateConfiguration/HandlersOnComplexResetUpdate.java fails with Unexpected reference: java.lang.ref.WeakReference
  • dc5590f: 8213932: [TESTBUG] assertEquals is invoked with the arguments in the wrong order
  • 1713cf1: 8215759: [test] java/math/BigInteger/ModPow.java can throw an ArithmeticException
  • 13eadde: 8215372: test/jdk/java/nio/file/DirectoryStream/Basic.java not correct when using a glob

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 9, 2023

@GoeLin Pushed as commit 369dedb.

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

@GoeLin GoeLin deleted the goetz_backport_8293996 branch January 9, 2023 16:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
1 participant