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

8261672: Reduce inclusion of classLoaderData.hpp #2555

Closed

Conversation

iklam
Copy link
Member

@iklam iklam commented Feb 12, 2021

classLoaderData.hpp is included by about 700 out of 1000 .o files in HotSpot. Most of these are transitively included through klass.hpp, typeArrayKlass.hpp and instanceKlass.hpp.

These headers can be refactored by moving inline functions that depend on ClassLoaderData to xxx.inline.hpp. This reduces the .o files that include classLoaderData.hpp to about 260.

(I also removed a bunch of unnecessary inclusion of classLoader.hpp from a few C files).

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/2555/head:pull/2555
$ git checkout pull/2555

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 12, 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 12, 2021

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

  • hotspot
  • serviceability

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 labels Feb 12, 2021
@iklam
Copy link
Member Author

iklam commented Feb 12, 2021

/label remove serviceability

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

openjdk bot commented Feb 12, 2021

@iklam
The serviceability label was successfully removed.

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

mlbridge bot commented Feb 12, 2021

Webrevs

Copy link
Member

@lfoltan lfoltan left a comment

Choose a reason for hiding this comment

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

LGTM.
Lois

@openjdk
Copy link

openjdk bot commented Feb 12, 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:

8261672: Reduce inclusion of classLoaderData.hpp

Reviewed-by: lfoltan, coleenp

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 12, 2021
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.

Looks good. I think adding compiledICHolder.inline.hpp is worth doing because performance matters to its caller in compiledMethod.cpp.

@iklam
Copy link
Member Author

iklam commented Feb 13, 2021

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

@openjdk openjdk bot closed this Feb 13, 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 13, 2021
@openjdk
Copy link

openjdk bot commented Feb 13, 2021

@iklam Pushed as commit 235da6a.

💡 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
3 participants