Skip to content
This repository has been archived by the owner on Sep 19, 2023. It is now read-only.
/ jdk21 Public archive

8313241: Temporarily disable "malformed control flow" assert to reduce noise #146

Closed
wants to merge 2 commits into from

Conversation

TobiHartmann
Copy link
Member

@TobiHartmann TobiHartmann commented Jul 27, 2023

JDK-8303951 added asserts before several C2 compilation bailouts that we were never able to trigger in our testing. The "malformed control flow" assert now triggers regularly (see JDK-8308392 and JDK-8312980). Let's disable it in JDK 21 to reduce the noise in the CI.

I also reverted the problem listing done by JDK-8313208 because, as @AlanBateman noted in #145, it's too invasive.

Approval is pending.

Thanks,
Tobias


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-8313241: Temporarily disable "malformed control flow" assert to reduce noise (Bug - P2)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 146

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21/pull/146.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 27, 2023

👋 Welcome back thartmann! 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 added the rfr Pull request is ready for review label Jul 27, 2023
@openjdk
Copy link

openjdk bot commented Jul 27, 2023

@TobiHartmann The following label will be automatically applied to this pull request:

  • hotspot-compiler

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.

@mlbridge
Copy link

mlbridge bot commented Jul 27, 2023

Webrevs

Copy link
Member

@chhagedorn chhagedorn 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.

@TobiHartmann
Copy link
Member Author

Thanks, Christian!

@openjdk
Copy link

openjdk bot commented Jul 27, 2023

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

8313241: Temporarily disable "malformed control flow" assert to reduce noise

Reviewed-by: chagedorn, kvn, dcubed

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 Jul 27, 2023
@@ -3993,7 +3993,6 @@ bool Compile::final_graph_reshaping() {
// Recheck with a better notion of 'required_outcnt'
if (n->outcnt() != required_outcnt) {
DEBUG_ONLY( n->dump_bfs(1, 0, "-"); );

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

May be remove dump node information too - it will pollute output.

@TobiHartmann
Copy link
Member Author

Good catch, Vladimir. Removed.

Copy link

@vnkozlov vnkozlov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good

Copy link
Member

@dcubed-ojdk dcubed-ojdk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thumbs up. Thanks for reducing the noise in the JDK21 CI!

@TobiHartmann
Copy link
Member Author

Thanks for the reviews, Daniel and Vladimir.

@TobiHartmann
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Jul 28, 2023

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

  • 1c875fd: 8313250: Exclude java/foreign/TestByteBuffer.java on AIX
  • 3e9344a: 8312293: SIGSEGV in jfr.internal.event.EventWriter.putUncheckedByte after JDK-8312086

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jul 28, 2023

@TobiHartmann Pushed as commit f242c3b.

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

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants