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

8331885: C2: meet between unloaded and speculative types is not symmetric #663

Conversation

TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Jun 4, 2024

Clean backport of JDK-8331885.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8331885 needs maintainer approval

Issue

  • JDK-8331885: C2: meet between unloaded and speculative types is not symmetric (Bug - P3 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 663

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 4, 2024

👋 Welcome back mdoerr! 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
Copy link

openjdk bot commented Jun 4, 2024

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

8331885: C2: meet between unloaded and speculative types is not symmetric

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

  • ce34aa9: 8332885: Clarify failure_handler self-tests
  • a160bd4: 8294148: Support JSplitPane for instructions and test UI
  • d275f51: 8316104: Open source several Swing SplitPane and RadioButton related tests

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 changed the title Backport 7652f9811bfddf08650b0c3277012074873deade 8331885: C2: meet between unloaded and speculative types is not symmetric Jun 4, 2024
@openjdk
Copy link

openjdk bot commented Jun 4, 2024

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

@openjdk
Copy link

openjdk bot commented Jun 4, 2024

⚠️ @TheRealMDoerr 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 rfr Pull request is ready for review label Jun 4, 2024
@mlbridge
Copy link

mlbridge bot commented Jun 4, 2024

Webrevs

@TheRealMDoerr
Copy link
Contributor Author

/approval request Should get backported for parity with 21.0.5-oracle. Applies cleanly. Tier 1-4 have passed.

@openjdk
Copy link

openjdk bot commented Jun 5, 2024

@TheRealMDoerr
8331885: The approval request has been created successfully.

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Jun 5, 2024
@TheRealMDoerr
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Jun 6, 2024

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

  • 8991255: 8326734: text-decoration applied to lost when mixed with or
  • ccee9d0: 8332499: Gtest codestrings.validate_vm fail on linux x64 when hsdis is present
  • 33ba538: 8331789: ubsan: deoptimization.cpp:403:29: runtime error: load of value 208, which is not a valid value for type 'bool'
  • ce34aa9: 8332885: Clarify failure_handler self-tests
  • a160bd4: 8294148: Support JSplitPane for instructions and test UI
  • d275f51: 8316104: Open source several Swing SplitPane and RadioButton related tests

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 6, 2024

@TheRealMDoerr Pushed as commit d7c7326.

💡 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 clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

1 participant