-
Notifications
You must be signed in to change notification settings - Fork 217
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
8296967: [JVMCI] rationalize relationship between getCodeSize and getCode in ResolvedJavaMethod #934
Conversation
👋 Welcome back sgehwolf! A progress list of the required criteria for merging this PR into |
This backport pull request has now been updated with issue from the original commit. |
@adinn Could you help with a review of this patch too, please? Thank you! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This also looks good.
I agree that dropping equalsTest is correct for this backport. However, if at some point we decide we need to backport JDK-8296967 we will have to try to remember also to reinsert equalsTest.
Thanks for the review! |
The parent pull request that this pull request depends on 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 jdk-8296967-jdk17u-backport
git fetch https://git.openjdk.org/jdk17u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push |
@jerboaa 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:
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 no new commits pushed to the ➡️ To integrate this PR with the above commit message to the |
…Code in ResolvedJavaMethod Not clean. Copyright in HotSpotResolvedJavaMethodImpl.java. getCodeSizeTest in TestResolvedJavaMethod.java as well as omitted equalsTest changes as that test is not in 17u (JDK-8289687 not in 17u as JDK-8289094 is not in 17u). HotSpotResolvedJavaFieldTest.java will need a follow-up: JDK-8297590
271e545
to
1bc873d
Compare
@jerboaa 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. |
/integrate |
Going to push as commit b464cc2. |
Not clean. Copyright in
HotSpotResolvedJavaMethodImpl.java
.getCodeSizeTest
inTestResolvedJavaMethod.java
fixed up manually, as well as omittedequalsTest
changesas that test is not in 17u (because both, JDK-8289687 and JDK-8289094 are not in 17u).
HotSpotResolvedJavaFieldTest.java will need a follow-up, JDK-8297590, in order to fix the test
and let it run. I'll get that backported to 17u once it's in JDK tip.
This pr depends on #933 as that PR changes the signature of the
createField
static method inHotSpotResolvedObjectTypeImpl
(which the test fix of JDK-8297590 corrects).Testing: jvmci tests (with backport of JDK-8297590 applied). Existing and newly included tests pass.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev pull/934/head:pull/934
$ git checkout pull/934
Update a local copy of the PR:
$ git checkout pull/934
$ git pull https://git.openjdk.org/jdk17u-dev pull/934/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 934
View PR using the GUI difftool:
$ git pr show -t 934
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/934.diff