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

8315920: C2: "control input must dominate current control" assert failure #2070

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Dec 21, 2023

I backport this for parity with 17.0.11-oracle.

I had to resolve two chunks in loopopt.cpp because of differences in context and spaces withing ().


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • JDK-8315920 needs maintainer approval
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8315920: C2: "control input must dominate current control" assert failure (Bug - P3 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2070

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 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 4e1e579e8b916191397fc958df32ac3f6003c791 8315920: C2: "control input must dominate current control" assert failure Dec 21, 2023
@openjdk
Copy link

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

mlbridge bot commented Dec 21, 2023

Webrevs

Copy link
Contributor

@rwestrel rwestrel 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 to me.

@openjdk
Copy link

openjdk bot commented Dec 22, 2023

⚠️ @GoeLin This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the approval label Dec 22, 2023
@openjdk
Copy link

openjdk bot commented Dec 22, 2023

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

8315920: C2: "control input must dominate current control" assert failure

Reviewed-by: roland

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

  • 32fc8a2: 8313816: Accessing jmethodID might lead to spurious crashes
  • c55cc97: 8319456: jdk/jfr/event/gc/collection/TestGCCauseWith[Serial|Parallel].java : GC cause 'GCLocker Initiated GC' not in the valid causes
  • 8e66afb: 8318689: jtreg is confused when folder name is the same as the test name
  • c0b4255: 8305356: Fix ignored bad CompileCommands in tests
  • 725f3c0: 8278363: Create extented container test groups
  • b6f24f5: 8274621: NullPointerException because listenAddress[0] is null
  • 4144ef3: 8318410: jdk/java/lang/instrument/BootClassPath/BootClassPathTest.sh fails on Japanese Windows

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 ready Pull request is ready to be integrated and removed approval labels Dec 22, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Dec 23, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Dec 23, 2023

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

  • 9a43e9f: 8321972: test runtime/Unsafe/InternalErrorTest.java timeout on linux-riscv64 platform
  • 32fc8a2: 8313816: Accessing jmethodID might lead to spurious crashes
  • c55cc97: 8319456: jdk/jfr/event/gc/collection/TestGCCauseWith[Serial|Parallel].java : GC cause 'GCLocker Initiated GC' not in the valid causes
  • 8e66afb: 8318689: jtreg is confused when folder name is the same as the test name
  • c0b4255: 8305356: Fix ignored bad CompileCommands in tests
  • 725f3c0: 8278363: Create extented container test groups
  • b6f24f5: 8274621: NullPointerException because listenAddress[0] is null
  • 4144ef3: 8318410: jdk/java/lang/instrument/BootClassPath/BootClassPathTest.sh fails on Japanese Windows

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Dec 23, 2023

@GoeLin Pushed as commit a60492e.

💡 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_8315920 branch December 23, 2023 10:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
2 participants