Skip to content

Conversation

@DamonFool
Copy link
Member

@DamonFool DamonFool commented Dec 21, 2025

Hi all,

Please review this tiny fix of missing include in systemDictionary.cpp.
For how to reproduce the error, please see the JBS.

Thanks.


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-8374178: Missing include in systemDictionary.cpp after JDK-8365526 (Bug - P4)

Reviewers

Reviewers without OpenJDK IDs

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 28946

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 21, 2025

👋 Welcome back jiefu! 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 Dec 21, 2025

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

8374178: Missing include in systemDictionary.cpp after JDK-8365526

Reviewed-by: kbarrett, dholmes

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

  • 9435d5b: 8346154: [XWayland] Some tests fail intermittently in the CI, but not locally
  • 25e8714: 8369515: Deadlock between JVMTI and JNI ReleasePrimitiveArrayCritical

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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Dec 21, 2025
@openjdk
Copy link

openjdk bot commented Dec 21, 2025

@DamonFool The following label will be automatically applied to this pull request:

  • hotspot-runtime

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

@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 21, 2025
@mlbridge
Copy link

mlbridge bot commented Dec 21, 2025

Webrevs

Comment on lines 90 to 92
#ifdef ASSERT
#include "oops/constantPool.inline.hpp"
#endif
Copy link
Member

Choose a reason for hiding this comment

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

There's no need to put this in an #if, or else the includes will become cluttered over time. You can just put it in the regular include lines above.

Choose a reason for hiding this comment

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

+1 - we generally conditionalize includes based on optional features or (rarely (never?) in shared code)
platforms, not on build type.

Comment on lines 90 to 92
#ifdef ASSERT
#include "oops/constantPool.inline.hpp"
#endif

Choose a reason for hiding this comment

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

+1 - we generally conditionalize includes based on optional features or (rarely (never?) in shared code)
platforms, not on build type.

@DamonFool
Copy link
Member Author

Thanks @iklam and @kimbarrett for the comments.
Updated.

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Trivially fine.

Just to reiterate what has been said in the past, we are not too concerned about making all possible combinations of enabled/disabled services work. If a "full" VM works and the Minimal VM works then that is normally sufficient.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 22, 2025
Copy link

@kimbarrett kimbarrett left a comment

Choose a reason for hiding this comment

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

Looks good.

@DamonFool
Copy link
Member Author

Thank you all for the review.

The linux-x64 build failure in the CI/CD was caused by System.IO.IOException: No space left on device : '/home/runner/actions-runner/cached/_diag/Worker_20251222-010841-utc.log', which shouldn't be caused by the change.

So will integrate it later.

@DamonFool
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Dec 22, 2025

Going to push as commit 9715e6d.
Since your change was applied there have been 7 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 Dec 22, 2025
@openjdk openjdk bot closed this Dec 22, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 22, 2025
@openjdk
Copy link

openjdk bot commented Dec 22, 2025

@DamonFool Pushed as commit 9715e6d.

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

@DamonFool DamonFool deleted the JDK-8374178 branch December 22, 2025 15:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Development

Successfully merging this pull request may close these issues.

5 participants