-
Notifications
You must be signed in to change notification settings - Fork 6.1k
8350892: [JVMCI] Align ResolvedJavaType.getInstanceFields with Class.getDeclaredFields #23849
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
Conversation
|
👋 Welcome back dnsimon! A progress list of the required criteria for merging this PR into |
|
@dougxc 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 361 new commits pushed to the
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 |
…eam (and Class.getDeclaredFields)
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.
Overall looks good to me
|
|
||
| // Now sort them by offset, ascending. | ||
| // (In principle, they could mix with superclass fields.) | ||
| fields->sort(sort_field_by_offset); |
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 has no effect now, i.e., the fields were sorted already?
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.
They now have whatever sort order is given by JavaFieldStream. This happens to currently be class file declaration order but it doesn't really matter if it changes. The only requirement is that the same order is used by get_reassigned_fields in deoptimization.cpp.
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.
Seems like a good change.
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.
Nice cleanup, CI changes look good to me.
|
Thanks for the reviews! /integrate |
|
Going to push as commit 0cb110e.
Your commit was automatically rebased without conflicts. |
The current order of fields returned by
ResolvedJavaType.getInstanceFieldsis a) not well specified and b) different than the order of fields used almost everywhere else in HotSpot. This PR aligns the order ofgetInstanceFieldswithClass.getDeclaredFields().It also makes
ciInstanceKlass::_nonstatic_fieldsuse the same order which unifies how escape analysis and deoptimization treats fields across C2 and JVMCI.Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/23849/head:pull/23849$ git checkout pull/23849Update a local copy of the PR:
$ git checkout pull/23849$ git pull https://git.openjdk.org/jdk.git pull/23849/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 23849View PR using the GUI difftool:
$ git pr show -t 23849Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/23849.diff
Using Webrev
Link to Webrev Comment