Skip to content
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

8261106: Reduce inclusion of jniHandles.hpp #2393

Closed
wants to merge 2 commits into from

Conversation

iklam
Copy link
Member

@iklam iklam commented Feb 4, 2021

niHandles.hpp is included by about 800 out of 1000 HotSpot .o files. Most of these are transitively included from these header files, which don't actually need to include jniHandles.hpp.

  • ci/ciBaseObject.hpp
  • ci/ciMetadata.hpp
  • ci/ciObject.hpp
  • classfile/moduleEntry.hpp
  • gc/shared/gcVMOperations.hpp
  • jvmci/jvmciJavaClasses.hpp
  • runtime/thread.hpp
  • services/threadService.hpp

Fixing these headers reduces the number of .o files that include jniHandles.hpp to 145.

Note: 43 files were changed in this PR. Most of them were using jniHandles.hpp but were not including it directly.

Tested with mach5: tier1, builds-tier2, builds-tier3, builds-tier4 and builds-tier5. Also locally: aarch64, arm, ppc64, s390, x86, and zero.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/2393/head:pull/2393
$ git checkout pull/2393

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 4, 2021

👋 Welcome back iklam! 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 4, 2021

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

  • hotspot
  • serviceability
  • shenandoah

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 serviceability serviceability-dev@openjdk.org hotspot hotspot-dev@openjdk.org shenandoah shenandoah-dev@openjdk.org labels Feb 4, 2021
@iklam
Copy link
Member Author

iklam commented Feb 4, 2021

/label remove serviceability

@openjdk openjdk bot removed the serviceability serviceability-dev@openjdk.org label Feb 4, 2021
@openjdk
Copy link

openjdk bot commented Feb 4, 2021

@iklam
The serviceability label was successfully removed.

@iklam iklam marked this pull request as ready for review February 4, 2021 01:35
@openjdk openjdk bot added the rfr Pull request is ready for review label Feb 4, 2021
@mlbridge
Copy link

mlbridge bot commented Feb 4, 2021

Webrevs

Copy link
Contributor

@coleenp coleenp left a comment

Choose a reason for hiding this comment

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

Ok! Seems trivial since I assume you've built this everywhere.

@openjdk
Copy link

openjdk bot commented Feb 4, 2021

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

8261106: Reduce inclusion of jniHandles.hpp

Reviewed-by: coleenp, hseigel

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 1 new commit pushed to the master branch:

  • e93e1e1: 8261157: Incorrect GPL header after JDK-8259956

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 ready Pull request is ready to be integrated label Feb 4, 2021
Copy link
Member

@hseigel hseigel left a comment

Choose a reason for hiding this comment

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

LGTM!
Harold

@iklam
Copy link
Member Author

iklam commented Feb 4, 2021

Thanks @coleenp and @hseigel for the review.
/integrate

@openjdk openjdk bot closed this Feb 4, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Feb 4, 2021
@openjdk
Copy link

openjdk bot commented Feb 4, 2021

@iklam Since your change was applied there have been 3 commits pushed to the master branch:

  • d9aefa3: 8260356: (tz) Upgrade time-zone data to tzdata2021a
  • bdcbfa1: 8259927: Windows jpackage installer issues
  • e93e1e1: 8261157: Incorrect GPL header after JDK-8259956

Your commit was automatically rebased without conflicts.

Pushed as commit c59e4b6.

💡 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
hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated shenandoah shenandoah-dev@openjdk.org
3 participants