Skip to content

Conversation

@linzihao1999
Copy link
Contributor

@linzihao1999 linzihao1999 commented Mar 22, 2025

Reorder jvmci includes in jvmciEvn.cpp


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-8347706: jvmciEnv.cpp has jvmci includes out of order (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 24174

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 22, 2025

👋 Welcome back linzihao1999! 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 Mar 22, 2025

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

8347706: jvmciEnv.cpp has jvmci includes out of order

Reviewed-by: dnsimon

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

  • 5dd0acb: 8352477: RISC-V: Print warnings when unsupported intrinsics are enabled
  • 334a1ee: 8351375: nsk/jvmti/ tests should fail when nsk_jvmti_setFailStatus() is called
  • 7442039: 8337279: Share StringBuilder to format instant
  • 22182f7: 8352112: [ubsan] hotspot/share/code/relocInfo.cpp:130:37: runtime error: applying non-zero offset 18446744073709551614 to null pointer
  • c2e14b1: 8343891: Test javax/swing/JTabbedPane/TestJTabbedPaneBackgroundColor.java failed
  • 52c6ce6: 8352091: GenShen: assert(!(request.generation->is_old() && _heap->old_generation()->is_doing_mixed_evacuations())) failed: Old heuristic should not request cycles while it waits for mixed evacuation
  • b8f3856: 8352420: [ubsan] codeBuffer.cpp:984:27: runtime error: applying non-zero offset 18446744073709486080 to null pointer
  • 0cb110e: 8350892: [JVMCI] Align ResolvedJavaType.getInstanceFields with Class.getDeclaredFields
  • 04eac0c: 8352159: RISC-V: add more zfa support
  • ac760dd: 8352423: RISC-V: simplify DivI/L ModI/L
  • ... and 128 more: https://git.openjdk.org/jdk/compare/af9af7e90f7dab5adc7b89b76eb978d269e863de...master

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 (@dougxc) 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
Copy link

openjdk bot commented Mar 22, 2025

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

  • graal
  • hotspot-compiler

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-compiler hotspot-compiler-dev@openjdk.org rfr Pull request is ready for review labels Mar 22, 2025
@linzihao1999 linzihao1999 changed the title 8347706: Reorder jvmci includes in jvmciEvn.cpp 8347706: jvmciEnv.cpp has jvmci includes out of order Mar 22, 2025
@mlbridge
Copy link

mlbridge bot commented Mar 22, 2025

Webrevs

Copy link
Member

@dougxc dougxc left a comment

Choose a reason for hiding this comment

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

The change is fine but I personally think manually fixing these ordering problems is not the best use of time until there's a way to automatically enforce the expected ordering (and catch regressions).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 22, 2025
@linzihao1999
Copy link
Contributor Author

You are right, Do we have some code check tool which help to point out the ordering issue?

@linzihao1999
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Mar 22, 2025
@openjdk
Copy link

openjdk bot commented Mar 22, 2025

@linzihao1999
Your change (at version f0a6b84) is now ready to be sponsored by a Committer.

@sendaoYan
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Mar 23, 2025

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

  • 5dd0acb: 8352477: RISC-V: Print warnings when unsupported intrinsics are enabled
  • 334a1ee: 8351375: nsk/jvmti/ tests should fail when nsk_jvmti_setFailStatus() is called
  • 7442039: 8337279: Share StringBuilder to format instant
  • 22182f7: 8352112: [ubsan] hotspot/share/code/relocInfo.cpp:130:37: runtime error: applying non-zero offset 18446744073709551614 to null pointer
  • c2e14b1: 8343891: Test javax/swing/JTabbedPane/TestJTabbedPaneBackgroundColor.java failed
  • 52c6ce6: 8352091: GenShen: assert(!(request.generation->is_old() && _heap->old_generation()->is_doing_mixed_evacuations())) failed: Old heuristic should not request cycles while it waits for mixed evacuation
  • b8f3856: 8352420: [ubsan] codeBuffer.cpp:984:27: runtime error: applying non-zero offset 18446744073709486080 to null pointer
  • 0cb110e: 8350892: [JVMCI] Align ResolvedJavaType.getInstanceFields with Class.getDeclaredFields
  • 04eac0c: 8352159: RISC-V: add more zfa support
  • ac760dd: 8352423: RISC-V: simplify DivI/L ModI/L
  • ... and 128 more: https://git.openjdk.org/jdk/compare/af9af7e90f7dab5adc7b89b76eb978d269e863de...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Mar 23, 2025
@openjdk openjdk bot closed this Mar 23, 2025
@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 Mar 23, 2025
@openjdk
Copy link

openjdk bot commented Mar 23, 2025

@sendaoYan @linzihao1999 Pushed as commit df9210e.

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

@sendaoYan
Copy link
Member

/sponsor

Sorry, did not noticed that this PR no satisfied more than 24 hours...

@linzihao1999 linzihao1999 deleted the 8347706 branch March 23, 2025 06:40
@dougxc
Copy link
Member

dougxc commented Mar 23, 2025

You are right, Do we have some code check tool which help to point out the ordering issue?

Not as far as I know but it should not be too hard to come up with. I've opened https://bugs.openjdk.org/browse/JDK-8352645 to have this considered.

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-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants