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 #2554

Closed
wants to merge 1 commit into from

Conversation

TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Jun 7, 2024

Backport of JDK-8331885. Manual integration was needed. I had to omit _interfaces in TypeInstPtr::with_speculative because JDK-8297933 is not in 17u. The context differs to some degree, but all modifications are integrated (each line). The test update applies cleanly. Please review!


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
  • JDK-8331885 needs maintainer approval

Issue

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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2554

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 7, 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 7, 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

Reviewed-by: mbaesken

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:

  • 8414ee3: 8294148: Support JSplitPane for instructions and test UI
  • 6910365: 8316104: Open source several Swing SplitPane and RadioButton related tests
  • 36384e8: 8323670: A few client tests intermittently throw ConcurrentModificationException
  • cda3768: 8326734: text-decoration applied to lost when mixed with or
  • bc857cb: 8281944: JavaDoc throws java.lang.IllegalStateException: ERRONEOUS
  • bcd19a5: 8333698: [17u] TestJstatdRmiPort fails after JDK-8333667
  • 2d9b1a6: 8303942: os::write should write completely

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 7, 2024
@openjdk
Copy link

openjdk bot commented Jun 7, 2024

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 Jun 7, 2024
@mlbridge
Copy link

mlbridge bot commented Jun 7, 2024

Webrevs

@openjdk
Copy link

openjdk bot commented Jun 10, 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.

@TheRealMDoerr
Copy link
Contributor Author

Thanks for the review!

@TheRealMDoerr
Copy link
Contributor Author

/approval request Should get backported for parity with 17.0.13-oracle. It doesn't apply cleanly, but has been reviewed. Tier 1-4 have passed.

@openjdk
Copy link

openjdk bot commented Jun 10, 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 10, 2024
@TheRealMDoerr
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Jun 11, 2024

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

  • 8414ee3: 8294148: Support JSplitPane for instructions and test UI
  • 6910365: 8316104: Open source several Swing SplitPane and RadioButton related tests
  • 36384e8: 8323670: A few client tests intermittently throw ConcurrentModificationException
  • cda3768: 8326734: text-decoration applied to lost when mixed with or
  • bc857cb: 8281944: JavaDoc throws java.lang.IllegalStateException: ERRONEOUS
  • bcd19a5: 8333698: [17u] TestJstatdRmiPort fails after JDK-8333667
  • 2d9b1a6: 8303942: os::write should write completely

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 11, 2024

@TheRealMDoerr Pushed as commit 92daaf2.

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

@TheRealMDoerr TheRealMDoerr deleted the 8331885_C2_meet branch June 11, 2024 06:31
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
Development

Successfully merging this pull request may close these issues.

2 participants