8298301: C2: assert(main_cmp->in(2)->Opcode() == Op_Opaque1) failed: main loop has no opaque node?

[chhagedorn]

This starts to show up in our CI in various tests after JDK-8269820 which added a new OpaqueZeroTripGuardNode but forgot to update an assert which still checks for Opaque1 instead of OpaqueZeroTripGuard. I've fixed that with this patch.

Currently running tests:

• tier1-4

Thanks,
Christian

---

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-8298301: C2: assert(main_cmp->in(2)->Opcode() == Op_Opaque1) failed: main loop has no opaque node?

Reviewers

• Tobias Hartmann (@TobiHartmann - Reviewer) ⚠️ Review applies to a0151669

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11567

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/11567.diff

[TobiHartmann]

The fix looks good and trivial.

FTR, my testing for JDK-8269820 didn't catch this because I only executed the stress job definition for the latest update (I did run full testing for v00 though).

[chhagedorn]

Thanks Tobias for the quick review! I'll try to integrate this as soon as testing is looking (mostly) good to reduce the noise in our CI.

[bridgekeeper]

👋 Welcome back chagedorn! 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]

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

8298301: C2: assert(main_cmp->in(2)->Opcode() == Op_Opaque1) failed: main loop has no opaque node?

Reviewed-by: thartmann

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

• 3934484: 8298205: Prefer Member Initialization Lists for JFR classes in os_perf.hpp

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]

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

Webrevs

• 00: Full (23434c46)

[vnkozlov]

Looks good.
One more reason to rename all Opaque nodes and find places where they are used.

[chhagedorn]

Thanks Vladimir for your review! I totally agree with that.

Testing is mostly done and looks clean. I'll integrate it.

[chhagedorn]

/integrate

[openjdk]

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

• 8edb98d: 8165943: LineBreakMeasurer does not measure correctly if TextAttribute.TRACKING is set.
• 3934484: 8298205: Prefer Member Initialization Lists for JFR classes in os_perf.hpp

Your commit was automatically rebased without conflicts.

[openjdk]

@chhagedorn Pushed as commit e86f31b.

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