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

Closed
wants to merge 2 commits into from

Conversation

iwanowww
Copy link
Contributor

@iwanowww iwanowww commented May 15, 2024

TypeInstPtr::xmeet_unloaded computes the MEET of two InstPtrs when at least one is unloaded, but doesn't preserve speculative part if one is present. It causes the corresponding assert to fail.

Proposed fix unconditionally keeps speculative part.

Testing: hs-tier1 - hs-tier4


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-8331885: C2: meet between unloaded and speculative types is not symmetric (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 19249

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 15, 2024

👋 Welcome back vlivanov! 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 May 15, 2024

@iwanowww 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: roland, 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 37 new commits pushed to the master branch:

  • d4c2edf: 8331855: Convert jdk.jdeps jdeprscan and jdeps to use the Classfile API
  • beeffd4: 8332109: Convert remaining tests using com.sun.tools.classfile to ClassFile API
  • e0d1c4b: 8321428: Deprecate for removal the package java.beans.beancontext
  • 0b0445b: 8331724: Refactor j.l.constant implementation to internal package
  • d84a8fd: 8332327: Return _methods_jmethod_ids field back in VMStructs
  • f1ce9b0: 8331557: Serial: Refactor SerialHeap::do_collection
  • 14198f5: 8329653: JLILaunchTest fails on AIX after JDK-8329131
  • ae999ea: 8129418: JShell: better highlighting of errors in imports on demand
  • 6422efa: 8332394: Add friendly output when @ir rule missing value
  • 9160ef8: 8332237: [nmt] Remove the need for ThreadStackTracker::track_as_vm()
  • ... and 27 more: https://git.openjdk.org/jdk/compare/8032d640c0d34fe507392a1d4faa4ff2005c771d...master

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
Copy link

openjdk bot commented May 15, 2024

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

@openjdk openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label May 15, 2024
@iwanowww iwanowww marked this pull request as ready for review May 15, 2024 13:52
@openjdk openjdk bot added the rfr Pull request is ready for review label May 15, 2024
@mlbridge
Copy link

mlbridge bot commented May 15, 2024

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 openjdk bot added the ready Pull request is ready to be integrated label May 16, 2024
Copy link
Member

@TobiHartmann TobiHartmann 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 too. Please also run hs-comp-stress and hs-precheckin-comp testing.

@dcubed-ojdk
Copy link
Member

@iwanowww - Will this fix be integrated soon? There are two solid failures in every
Tier5 job set and have been for quite a while.

@iwanowww
Copy link
Contributor Author

Thanks for the reviews, Roland and Tobias.

hs-comp-stress and hs-precheckin-comp testing passed.

/integrate

@openjdk
Copy link

openjdk bot commented May 20, 2024

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

  • d6b7f9b: 8331851: Add specific regression leap year tests for Calendar.roll()
  • b92bd67: 8332403: Anachronistic reference to Netscape Communicator in Swing API docs
  • 8acdd2d: 8330565: C2: Multiple crashes with CTW after JDK-8316991
  • 0a58cff: 8298405: Implement JEP 467: Markdown Documentation Comments
  • 39a55e9: 8324809: compiler can crash with SOE while proving if two recursive types are disjoint
  • b7ae0ae: 8328572: JFR: Use Class.forPrimitiveName(String)
  • e611151: 8331281: RISC-V: C2: Support vector-scalar and vector-immediate bitwise logic instructions
  • 44bdf99: 8332239: Improve CSS for block tags
  • 9bb6169: 8317621: --add-script should support JavaScript modules
  • 4eb1eaf: 8329617: Update stylesheet for specs and tool documentation
  • ... and 37 more: https://git.openjdk.org/jdk/compare/8032d640c0d34fe507392a1d4faa4ff2005c771d...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 20, 2024

@iwanowww Pushed as commit 7652f98.

💡 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
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