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

8310494: Do not include constantPool.hpp from instanceKlass.hpp #14597

Conversation

iklam
Copy link
Member

@iklam iklam commented Jun 21, 2023

instanceKlass.hpp is needed quite frequently for HotSpot C++ sources, but constantPool.hpp is much less frequently.

This PR is the first step of reducing the inclusion of constantPool.hpp, by removing it from instanceKlass.hpp

I moved a bunch of inline functions into instanceKlass.cpp. These don't seem to be performance related.


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-8310494: Do not include constantPool.hpp from instanceKlass.hpp (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14597

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 21, 2023

👋 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 openjdk bot added the rfr Pull request is ready for review label Jun 21, 2023
@openjdk
Copy link

openjdk bot commented Jun 21, 2023

@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 hotspot-dev@openjdk.org label Jun 21, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 21, 2023

Webrevs

Copy link
Member

@stefank stefank left a comment

Choose a reason for hiding this comment

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

I think this change looks fine (minus a couple of nits).

I do wonder if the code wouldn't be nicer if we simply removed these delegating functions in InstanceKlass and let the callers operate on the ConstantPool directly instead?

src/hotspot/share/classfile/javaClasses.hpp Outdated Show resolved Hide resolved
src/hotspot/share/oops/instanceKlass.hpp Outdated Show resolved Hide resolved
@iklam
Copy link
Member Author

iklam commented Jun 22, 2023

I do wonder if the code wouldn't be nicer if we simply removed these delegating functions in InstanceKlass and let the callers operate on the ConstantPool directly instead?

The version and signature logically belong to the class, so I think the functions should be part of InstanceKlass. The fact that they are stored inside the ConstantPool is just an implementation detail that can change. IIRC it was done this way because the ConstantPool can be stored in the read-only section of the CDS archive.

Copy link
Member

@stefank stefank left a comment

Choose a reason for hiding this comment

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

Reviewed. Left some nits that you could consider.

Comment on lines 994 to 996
// The constant pool is on stack if any of the methods are executing or
// referenced by handles.
bool on_stack() const { return _constants->on_stack(); }
virtual bool on_stack() const;
Copy link
Member

Choose a reason for hiding this comment

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

The comment looks weird now that the implementation, which delegates to the constant pool, has been moved from the header. I think the comment needs to be updated.

Copy link
Contributor

Choose a reason for hiding this comment

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

Suggest move the comment to the implementation.

@openjdk
Copy link

openjdk bot commented Jun 22, 2023

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

8310494: Do not include constantPool.hpp from instanceKlass.hpp

Reviewed-by: stefank, 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 11 new commits pushed to 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 Jun 22, 2023
@iklam
Copy link
Member Author

iklam commented Jun 23, 2023

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

@openjdk
Copy link

openjdk bot commented Jun 23, 2023

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

openjdk bot commented Jun 23, 2023

@iklam Pushed as commit bfcca5e.

💡 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