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

8233019: java.lang.Class.isPrimitive() (C1) returns wrong result if Klass* is aligned to 32bit #43

Closed
wants to merge 5 commits into from

Conversation

dongbohe
Copy link
Member

@dongbohe dongbohe commented Apr 20, 2022

Hi,

I would like to backport this as follow up of JDK-8150669
This resolves the corner case that leads to incorrect result for C1 intrinsic,

Original patch for 11u: https://hg.openjdk.java.net/jdk-updates/jdk11u-dev/rev/e1b6631cbd2f
Patch does not apply cleanly to 8u: arm and s390 ports are not there and we don’t have c1 compiler support in ppc port in 8u.

Performed full jtreg test both on x86_64-linux-gnu and aarch64-linux-gnu platforms.
(I made this PR on behalf of fyang)

Thanks,
hedongbo


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-8233019: java.lang.Class.isPrimitive() (C1) returns wrong result if Klass* is aligned to 32bit

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 43

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 20, 2022

👋 Welcome back dongbohe! A progress list of the required criteria for merging this PR into pr/37 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 890f94d7e6be731ac2ebae2f1ad3cc20ec836115 8150669: C1 intrinsic for Class.isPrimitive Apr 20, 2022
@openjdk
Copy link

openjdk bot commented Apr 20, 2022

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 Apr 20, 2022
@dongbohe dongbohe changed the title 8150669: C1 intrinsic for Class.isPrimitive Backport b67ca938f37f952e53f73d2e0b8ebcaf96139fda Apr 20, 2022
@openjdk openjdk bot changed the title Backport b67ca938f37f952e53f73d2e0b8ebcaf96139fda 8233019: java.lang.Class.isPrimitive() (C1) returns wrong result if Klass* is aligned to 32bit Apr 20, 2022
@openjdk
Copy link

openjdk bot commented Apr 20, 2022

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

@mlbridge
Copy link

mlbridge bot commented Apr 20, 2022

Webrevs

@bridgekeeper
Copy link

bridgekeeper bot commented May 18, 2022

@dongbohe This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 15, 2022

@dongbohe This pull request has been inactive for more than 8 weeks and will now be automatically closed. If you would like to continue working on this pull request in the future, feel free to reopen it! This can be done using the /open pull request command.

@bridgekeeper bridgekeeper bot closed this Jun 15, 2022
@dongbohe
Copy link
Member Author

/open

@openjdk openjdk bot reopened this Jun 16, 2022
@openjdk
Copy link

openjdk bot commented Jun 16, 2022

@dongbohe This pull request is now open

@openjdk
Copy link

openjdk bot commented Jun 16, 2022

⚠️ @dongbohe This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

@openjdk-notifier
Copy link

@dongbohe Please do not rebase or force-push to an active PR as it invalidates existing review comments. All changes will be squashed into a single commit automatically when integrating. See OpenJDK Developers’ Guide for more information.

Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

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

Lgtm.

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/37 to master July 8, 2022 18:05
@openjdk-notifier
Copy link

The dependent pull request has now been integrated, and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout 8233019
git fetch https://git.openjdk.org/jdk8u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Jul 8, 2022

@dongbohe This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8233019: java.lang.Class.isPrimitive() (C1) returns wrong result if Klass* is aligned to 32bit

Reviewed-by: phh

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 1 new commit pushed to the master branch:

  • e005185: 8235218: Minimal VM is broken after JDK-8173361

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@phohensee) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jul 8, 2022
@dongbohe
Copy link
Member Author

Got the push approval.
/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jul 11, 2022
@openjdk
Copy link

openjdk bot commented Jul 11, 2022

@dongbohe
Your change (at version 69b5b2f) is now ready to be sponsored by a Committer.

@RealFYang
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Jul 11, 2022

Going to push as commit 972112e.
Since your change was applied there has been 1 commit pushed to the master branch:

  • e005185: 8235218: Minimal VM is broken after JDK-8173361

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jul 11, 2022

@RealFYang @dongbohe Pushed as commit 972112e.

💡 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 integrated Pull request has been integrated
3 participants