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

8309266: C2: assert(final_con == (jlong)final_int) failed: final value should be integer #1570

Closed
wants to merge 3 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jul 11, 2023

I backport this for parity with 17.0.9-oracle.

Clean backport, but does not compiole because is_ConI is not supported by 17.
I include the parts to define this from "8298952: All nodes should have type(n) == Value(n) after IGVN"


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-8309266: C2: assert(final_con == (jlong)final_int) failed: final value should be integer (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1570

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 11, 2023

👋 Welcome back goetz! 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 changed the title Backport 4a9cc8a000cafb3ad77a33710054b567e8553652 8309266: C2: assert(final_con == (jlong)final_int) failed: final value should be integer Jul 11, 2023
@openjdk
Copy link

openjdk bot commented Jul 11, 2023

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 Jul 11, 2023
@mlbridge
Copy link

mlbridge bot commented Jul 11, 2023

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.

Other than that, looks good to me.

@@ -573,8 +574,7 @@ class Node {
// Def-Use info is unchanged
Node* n1 = in(i1);
Node* n2 = in(i2);
_in[i1] = n2;
_in[i2] = n1;
_in[i1] = n2; _in[i2] = n1;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where does that change come from?

Copy link
Member Author

@GoeLin GoeLin Jul 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A type-o. Thanks for catching this. Fixed.

@openjdk
Copy link

openjdk bot commented Jul 12, 2023

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

8309266: C2: assert(final_con == (jlong)final_int) failed: final value should be integer

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

  • 2b8c260: 8310259: Pin msys2/setup-msys2 github action to a specific commit
  • 3006096: 8308192: Error in parsing replay file when staticfield is an array of single dimension
  • b0b79a9: 8301097: Update GHA XCode to 12.5.1
  • 310115a: 8305763: Parsing a URI with an underscore goes through a silent exception, negatively impacting performance
  • e61bb2e: 8267517: async logging for stdout and stderr
  • 9288072: 8292716: Configure should check that jtreg is of the required version
  • 1248b15: 8303154: Investigate and improve instruction cache flushing during compilation
  • 4eeb1c9: 8180266: Convert sun/security/provider/KeyStore/DKSTest.sh to Java Jtreg Test
  • f45578e: 8225012: sanity/client/SwingSet/src/ToolTipDemoTest.java fails on Windows
  • a299757: 8297476: Increase InlineSmallCode default from 1000 to 2500 for RISC-V

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 Pull request is ready to be integrated label Jul 12, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Jul 14, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jul 14, 2023

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

  • a6ef655: 8309119: [17u/11u] Redo JDK-8297951: C2: Create skeleton predicates for all If nodes in loop predication
  • 3cc7858: 8307683: Loop Predication should not hoist range checks with trap on success projection by negating their condition
  • 9f3c095: 8307555: Reduce memory reads in x86 MD5 intrinsic
  • 2b8c260: 8310259: Pin msys2/setup-msys2 github action to a specific commit
  • 3006096: 8308192: Error in parsing replay file when staticfield is an array of single dimension
  • b0b79a9: 8301097: Update GHA XCode to 12.5.1
  • 310115a: 8305763: Parsing a URI with an underscore goes through a silent exception, negatively impacting performance
  • e61bb2e: 8267517: async logging for stdout and stderr
  • 9288072: 8292716: Configure should check that jtreg is of the required version
  • 1248b15: 8303154: Investigate and improve instruction cache flushing during compilation
  • ... and 3 more: https://git.openjdk.org/jdk17u-dev/compare/d5eec584da2bb6a43ab9df3379958b2dd6a4dd9f...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jul 14, 2023

@GoeLin Pushed as commit 97cf4fe.

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

@GoeLin GoeLin deleted the goetz_backport_8309266 branch July 14, 2023 06:54
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
2 participants