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

[iklam]

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

• Stefan Karlsson (@stefank - Reviewer) ⚠️ Review applies to 68697195
• Coleen Phillimore (@coleenp - Reviewer)

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]

👋 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]

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

[mlbridge]

Webrevs

• 02: Full - Incremental (f8bd76ac)
• 01: Full - Incremental (68697195)
• 00: Full (8c12d578)

[stefank]

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?

[iklam]

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.

[stefank]

Reviewed. Left some nits that you could consider.

[stefank]

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.

[coleenp]

Suggest move the comment to the implementation.

[openjdk]

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

• a9c0a0f: 8310628: GcInfoBuilder.c missing JNI Exception checks
• 556831d: 8310460: Remove jdeps -profile option
• d91d0d3: 8310537: Fix -Wconversion warnings in gcUtil.hpp
• 7628da2: 8279254: PKCS9Attribute SigningTime always encoded in UTFTime
• 5ca4cdd: 8309740: Expand timeout windows for tests in JDK-8179502
• e78fd46: 8310735: Build failure after JDK-8310577 with GCC8
• 4bf7816: 8309670: java -help output for --module-path / -p is incomplete
• d1d2b55: 8309733: [macOS, Accessibility] VoiceOver: Incorrect announcements of JRadioButton
• d6685f0: 8310510: Remove WordsPerLong
• 31dcda5: 8295210: IR framework should not whitelist -XX:-UseTLAB
• ... and 1 more: https://git.openjdk.org/jdk/compare/5a82fa3bb278b5b80b9ede0619f364fe13cdbede...master

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.

[iklam]

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

[openjdk]

Going to push as commit bfcca5e.
Since your change was applied there have been 12 commits pushed to the master branch:

• 0314292: 8310267: Javadoc for Class#isPrimitive() is incorrect regarding Class objects for primitives
• a9c0a0f: 8310628: GcInfoBuilder.c missing JNI Exception checks
• 556831d: 8310460: Remove jdeps -profile option
• d91d0d3: 8310537: Fix -Wconversion warnings in gcUtil.hpp
• 7628da2: 8279254: PKCS9Attribute SigningTime always encoded in UTFTime
• 5ca4cdd: 8309740: Expand timeout windows for tests in JDK-8179502
• e78fd46: 8310735: Build failure after JDK-8310577 with GCC8
• 4bf7816: 8309670: java -help output for --module-path / -p is incomplete
• d1d2b55: 8309733: [macOS, Accessibility] VoiceOver: Incorrect announcements of JRadioButton
• d6685f0: 8310510: Remove WordsPerLong
• ... and 2 more: https://git.openjdk.org/jdk/compare/5a82fa3bb278b5b80b9ede0619f364fe13cdbede...master

Your commit was automatically rebased without conflicts.

[openjdk]

@iklam Pushed as commit bfcca5e.

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