Skip to content

Conversation

@dougxc
Copy link
Member

@dougxc dougxc commented Feb 28, 2025

The current order of fields returned by ResolvedJavaType.getInstanceFields is a) not well specified and b) different than the order of fields used almost everywhere else in HotSpot. This PR aligns the order of getInstanceFields with Class.getDeclaredFields().

It also makes ciInstanceKlass::_nonstatic_fields use the same order which unifies how escape analysis and deoptimization treats fields across C2 and JVMCI.


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-8350892: [JVMCI] Align ResolvedJavaType.getInstanceFields with Class.getDeclaredFields (Enhancement - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/23849/head:pull/23849
$ git checkout pull/23849

Update a local copy of the PR:
$ git checkout pull/23849
$ git pull https://git.openjdk.org/jdk.git pull/23849/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 23849

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/23849.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 28, 2025

👋 Welcome back dnsimon! 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
Copy link

openjdk bot commented Feb 28, 2025

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

8350892: [JVMCI] Align ResolvedJavaType.getInstanceFields with Class.getDeclaredFields

Reviewed-by: yzheng, never, thartmann

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 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
Copy link

openjdk bot commented Feb 28, 2025

@dougxc The following labels will be automatically applied to this pull request:

  • graal
  • hotspot

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added graal graal-dev@openjdk.org hotspot hotspot-dev@openjdk.org labels Feb 28, 2025
@dougxc dougxc marked this pull request as ready for review March 3, 2025 15:28
@openjdk openjdk bot added the rfr Pull request is ready for review label Mar 3, 2025
@mlbridge
Copy link

mlbridge bot commented Mar 3, 2025

Webrevs

Copy link
Contributor

@mur47x111 mur47x111 left a 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);
Copy link
Contributor

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?

Copy link
Member Author

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.

Copy link
Contributor

@tkrodriguez tkrodriguez left a 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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 21, 2025
Copy link
Member

@TobiHartmann TobiHartmann left a 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.

@dougxc
Copy link
Member Author

dougxc commented Mar 21, 2025

Thanks for the reviews!

/integrate

@openjdk
Copy link

openjdk bot commented Mar 21, 2025

Going to push as commit 0cb110e.
Since your change was applied there have been 361 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 21, 2025

@dougxc Pushed as commit 0cb110e.

💡 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

graal graal-dev@openjdk.org hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

4 participants