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

8264797: Do not include klassVtable.hpp from instanceKlass.hpp #3360

Conversation

@iklam
Copy link
Member

@iklam iklam commented Apr 6, 2021

instanceKlass.hpp is a popular header, included by 647 of about 1000 HotSpot .o files. It unnecessarily includes klassVtable.hpp (only forward class declarations are needed).

After refactoring, the number of .o files that includes klassVtable.hpp reduces from 647 to 132.


Progress

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

Issue

  • JDK-8264797: Do not include klassVtable.hpp from instanceKlass.hpp

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/3360/head:pull/3360
$ git checkout pull/3360

Update a local copy of the PR:
$ git checkout pull/3360
$ git pull https://git.openjdk.java.net/jdk pull/3360/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3360

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/3360.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 6, 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 openjdk bot commented Apr 6, 2021

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

  • hotspot

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 hotspot label Apr 6, 2021
@iklam
Copy link
Member Author

@iklam iklam commented Apr 6, 2021

/label remove hotspot
/label add hotspot-runtime

@openjdk openjdk bot removed the hotspot label Apr 6, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 6, 2021

@iklam
The hotspot label was successfully removed.

@openjdk
Copy link

@openjdk openjdk bot commented Apr 6, 2021

@iklam
The hotspot-runtime label was successfully added.

@iklam iklam marked this pull request as ready for review Apr 6, 2021
@openjdk openjdk bot added the rfr label Apr 6, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 6, 2021

Webrevs

@coleenp
coleenp approved these changes Apr 6, 2021
Copy link

@coleenp coleenp left a comment

I thought you'd need to include the file because of this, because it's not a pointer:
klassItable itable() const; // return klassItable wrapper

That's good that you don't!

@openjdk
Copy link

@openjdk openjdk bot commented Apr 6, 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:

8264797: Do not include klassVtable.hpp from instanceKlass.hpp

Reviewed-by: coleenp, stefank

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

  • a756d8d: 8264759: x86_32 Minimal VM build failure after JDK-8262355
  • 0f13e22: 8264791: java/util/Random/RandomTestBsi1999.java failed "java.security.SecureRandom nextFloat consecutive"
  • 4bb80f3: 8262898: com/sun/net/httpserver/bugs/8199849/ParamTest.java times out
  • 2f51699: 8264554: X509KeyManagerImpl calls getProtectionParameter with incorrect alias
  • 114e3c3: 8263856: Github Actions for macos/aarch64 cross-build
  • a611c46: 8264048: Fix caching in Jar URL connections when an entry is missing
  • bf26a25: 8264027: Refactor "CLEANUP" region printing
  • eb6330e: 8264047: Duplicate global variable 'jvm' in libjavajpeg and libawt
  • 8132548: 8264359: Compiler directives should enable DebugNonSafepoints when PrintAssembly is requested
  • ec7b002: 8264626: C1 should be able to inline excluded methods

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 label Apr 6, 2021
@iklam
Copy link
Member Author

@iklam iklam commented Apr 6, 2021

I thought you'd need to include the file because of this, because it's not a pointer:
klassItable itable() const; // return klassItable wrapper

That's good that you don't!

Thanks for the review.

I looked this up to make sure what I am doing is allowed. Accord to the C++ specification, a forward-declared class is an incomplete type, which cannot be used "in general, when the size and layout of the type must be known". In this case, we just have a declaration of a function, so an incomplete type is allowed.

@stefank
stefank approved these changes Apr 6, 2021
@iklam
Copy link
Member Author

@iklam iklam commented Apr 7, 2021

Thanks @stefank and @coleenp for the review!
/integrate

@openjdk openjdk bot closed this Apr 7, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Apr 7, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 7, 2021

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

  • eb5c097: 8262389: Use permitted_enctypes if default_tkt_enctypes or default_tgs_enctypes is not present
  • bfb034a: 8264524: jdk/internal/platform/docker/TestDockerMemoryMetrics.java fails due to swapping not working
  • a756d8d: 8264759: x86_32 Minimal VM build failure after JDK-8262355
  • 0f13e22: 8264791: java/util/Random/RandomTestBsi1999.java failed "java.security.SecureRandom nextFloat consecutive"
  • 4bb80f3: 8262898: com/sun/net/httpserver/bugs/8199849/ParamTest.java times out
  • 2f51699: 8264554: X509KeyManagerImpl calls getProtectionParameter with incorrect alias
  • 114e3c3: 8263856: Github Actions for macos/aarch64 cross-build
  • a611c46: 8264048: Fix caching in Jar URL connections when an entry is missing
  • bf26a25: 8264027: Refactor "CLEANUP" region printing
  • eb6330e: 8264047: Duplicate global variable 'jvm' in libjavajpeg and libawt
  • ... and 2 more: https://git.openjdk.java.net/jdk/compare/ff223530b66a83fb77c477da97a2dd60df448ec8...master

Your commit was automatically rebased without conflicts.

Pushed as commit c3abdc9.

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