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

8263448: CTW: fatal error: meet not symmetric #3298

Closed
wants to merge 1 commit into from

Conversation

@vnkozlov
Copy link
Contributor

@vnkozlov vnkozlov commented Mar 31, 2021

In bug's case instance_id should be changed to InstanceBot only if it is real id and not InstanceTop or InstanceBot (similar to Constant in type lattice). Otherwise we incorrectly change InstanceTop to InstanceBot. In short, we should follow PTR transformation in this code:

      if (ptr == Constant) {
         ptr = NotNull;
      }
-     instance_id = InstanceBot;
+     if (instance_id > 0) {
+       instance_id = InstanceBot;
+     }

I noticed that TypeInstPtr::xmeet_helper() has the same code as TypeAryPtr::xmeet_helper() for case when InstPtr meets AryPtr. So instead of fixing two places I decided to call TypeAryPtr::xmeet_helper() from TypeInstPtr::xmeet_helper() for this case. We do similar thing in TypeOopPtr::xmeet():
https://github.com/openjdk/jdk/blob/master/src/hotspot/share/opto/type.cpp#L3283

Fixed code style in touched code.

Tested failing test from bug report, hs-tier1-4, hs-comp.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/3298/head:pull/3298
$ git checkout pull/3298

Update a local copy of the PR:
$ git checkout pull/3298
$ git pull https://git.openjdk.java.net/jdk pull/3298/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3298

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/3298.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Mar 31, 2021

👋 Welcome back kvn! 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 label Mar 31, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Mar 31, 2021

@vnkozlov 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 mlbridge bot commented Mar 31, 2021

Webrevs

Copy link
Contributor

@rwestrel rwestrel left a comment

Looks good to me.

@openjdk
Copy link

@openjdk openjdk bot commented Apr 1, 2021

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

8263448: CTW: fatal error: meet not symmetric

Reviewed-by: roland

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:

  • d2df9a7: 8264331: Use the blessed modifier order in jdk.compiler
  • 0228734: 8262470: Printed GlyphVector outline with low DPI has bad quality on Windows
  • 3997c99: 8264222: Use switch expression in jshell where possible
  • 39f0b27: 8176026: SA: Huge heap sizes cause a negative value to be displayed in the jhisto heap total
  • de495df: 8264413: Data is written to file header even if its CRC32 was calculated
  • 52d8a22: 8264054: Bad XMM performance on java.lang.MathBench.sqrtDouble
  • 16acfaf: 8012229: [lcms] Improve performance of color conversion for images with alpha channel

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 added the ready label Apr 1, 2021
@vnkozlov
Copy link
Contributor Author

@vnkozlov vnkozlov commented Apr 1, 2021

Thank you, Roland.

@vnkozlov
Copy link
Contributor Author

@vnkozlov vnkozlov commented Apr 1, 2021

/integrate

@openjdk openjdk bot closed this Apr 1, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Apr 1, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 1, 2021

@vnkozlov Since your change was applied there have been 16 commits pushed to the master branch:

  • 328e951: 8169629: Annotations with lambda expressions cause AnnotationFormatError
  • c04a743: 8264557: Incorrect copyright year for test/micro/org/openjdk/bench/java/lang/MathBench.java after JDK-8264054
  • 4b19771: 8264150: CDS dumping code calls TRAPS functions in VM thread
  • 1dc75e9: 8264538: Rename SystemDictionary::parse_stream
  • 80681b5: 8264546: Dependencies: Context class is always an InstanceKlass
  • fdfa1dd: 8264306: Non deterministic generation of java/lang/invoke/MemberName.class
  • 011f6d1: 8264223: CodeHeap::verify fails extra_hops assertion in fastdebug test
  • 0696fd0: 8263496: MetalHighContrastTheme.getControlHighlight cleanup
  • 6cf1095: 8264484: Replace uses of StringBuffer with StringBuilder in jdk.hotspot.agent
  • d2df9a7: 8264331: Use the blessed modifier order in jdk.compiler
  • ... and 6 more: https://git.openjdk.java.net/jdk/compare/cb70ab0cb92d1430dedccab8d81334538a62a1e1...master

Your commit was automatically rebased without conflicts.

Pushed as commit 6e0da99.

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

@vnkozlov vnkozlov deleted the vnkozlov:JDK-8263448 branch Apr 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants