8366474: Rename MetaspaceObj::is_shared() to MetaspaceObj::in_aot_cache() #27016

iklam · 2025-08-30T02:13:20Z

This PR is one (of many) steps in JDK-8366473 (Refactor CDS source code with new AOT terminology):

Rename is_shared() in Metaspace (and various other classes) to in_aot_cache() to reflect its true meaning:

tests if an object is inside the AOT cache's metaspace region.

Also various forms of "shared metaspace" are updated to "aot metaspace"

Please start your review with allocations.hpp

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-8366474: Rename MetaspaceObj::is_shared() to MetaspaceObj::in_aot_cache() (Sub-task - P4)

Reviewers

Vladimir Kozlov (@vnkozlov - Reviewer) Review applies to 6b8a1b0c
Chen Liang (@liach - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 27016

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

Using diff file

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

Using Webrev

Link to Webrev Comment

…he()

bridgekeeper · 2025-08-30T02:13:53Z

👋 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 · 2025-08-30T02:14:20Z

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

8366474: Rename MetaspaceObj::is_shared() to MetaspaceObj::in_aot_cache()

Reviewed-by: liach, kvn

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 · 2025-08-30T02:14:50Z

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

mlbridge · 2025-08-30T02:18:24Z

Webrevs

vnkozlov · 2025-08-30T14:01:00Z

src/hotspot/share/include/cds.h

@@ -35,7 +35,7 @@
 //
 // Also, this is a C header file. Do not use C++ here.

-#define NUM_CDS_REGIONS 5 // this must be the same as MetaspaceShared::n_regions
+#define NUM_CDS_REGIONS 5 // this must be the same as AOTMetaspace::n_regions


This file changes seems belong to your other RFE JDK-8366475.

But I am fine to have it here - it is only in comments.

vnkozlov · 2025-08-30T14:04:45Z

test/hotspot/jtreg/runtime/cds/SpaceUtilizationCheck.java

-        System.out.println("MetaspaceShared::core_region_alignment() = " + reserve_alignment);
+        System.out.println("AOTMetaspace::core_region_alignment() = " + reserve_alignment);


I removed these changes and re-applied them in #27017 .

vnkozlov

Good. In few places you used AOTMetaspace in comments and messages. But I think it is fine. I assume you push this first.

…penjdk#27017

vnkozlov

Update is good.

dholmes-ora · 2025-09-01T06:58:15Z

Maybe the JBS title should be a bit more generic as you seem to be renaming many occurrences of "shared" not just the one listed.

iklam · 2025-09-02T19:44:40Z

Maybe the JBS title should be a bit more generic as you seem to be renaming many occurrences of "shared" not just the one listed.

The majority of the changes are about is_shared -> in_aot_cache. There are other changes like _shared_metaspace_static_top -> _aot_metaspace_static_top, but these are just implementation details.

This PR is one of the (many) subtasks for the "CDS" -> "AOT" renaming (main issue is JDK-8366473). My plan is to name each subtask to indicate its main purpose. Otherwise it will be difficult to be both precise and concise in the JBS title.

I.e., in this step I renamed some "shared" but left others, so I can't precisely describe that without writing a long essay.
If I used a generic title then it's difficult to tell the difference with other subtasks.

liach

This rename is absolutely clarifying. Did not review the technical aspects of hotspot.

openjdk · 2025-09-04T02:18:35Z

@iklam this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout 8366474-rename_metaspaceobj_is_shared_to_in_aot_cache
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

…n_aot_cache

…j::is_shared()

iklam · 2025-09-04T03:03:03Z

I've merged with the mainline to resolve conflicts.

I also made one extra fix: ConstantPool::is_shared() was shadowing MetaspaceObj::is_shared(), so I renamed it to in_aot_cache(), so that it will now shadow MetaspaceObj::in_aot_cache(). See 17f8c0b

@vnkozlov @liach could you re-review?

liach

The subsequent fix looks good.

iklam · 2025-09-04T04:47:08Z

Thanks @vnkozlov @liach for the review
/integrate

openjdk · 2025-09-04T04:47:49Z

Going to push as commit 90a2db1.
Since your change was applied there has been 1 commit pushed to the master branch:

4d1dfab: 8366038: Thread::SpinRelease should use Atomic::release_store

Your commit was automatically rebased without conflicts.

openjdk · 2025-09-04T04:47:56Z

@iklam Pushed as commit 90a2db1.

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

8366474: Rename MetaspaceObj::is_shared() to MetaspaceObj::in_aot_cac…

4c68981

…he()

openjdk bot added serviceability [email protected] hotspot [email protected] rfr Pull request is ready for review labels Aug 30, 2025

openjdk bot mentioned this pull request Aug 30, 2025

8366475: Rename MetaspaceShared class to AOTMetaspace #27017

Closed

3 tasks

vnkozlov reviewed Aug 30, 2025

View reviewed changes

vnkozlov approved these changes Aug 30, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Aug 30, 2025

Removed MetaspaceShared -> AOTMetaspace changes that are intended for o…

6b8a1b0

…penjdk#27017

openjdk bot removed the ready Pull request is ready to be integrated label Aug 30, 2025

vnkozlov approved these changes Aug 30, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Aug 30, 2025

liach approved these changes Sep 4, 2025

View reviewed changes

openjdk bot added merge-conflict Pull request has merge conflict with target branch and removed ready Pull request is ready to be integrated labels Sep 4, 2025

iklam added 2 commits September 3, 2025 19:34

Merge branch 'master' into 8366474-rename_metaspaceobj_is_shared_to_i…

143b4f6

…n_aot_cache

Also renamed ConstantPool::is_shared() because it shadows MetaspaceOb…

17f8c0b

…j::is_shared()

openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Sep 4, 2025

liach approved these changes Sep 4, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Sep 4, 2025

openjdk bot added the integrated Pull request has been integrated label Sep 4, 2025

openjdk bot closed this Sep 4, 2025

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 4, 2025

		System.out.println("MetaspaceShared::core_region_alignment() = " + reserve_alignment);
		System.out.println("AOTMetaspace::core_region_alignment() = " + reserve_alignment);

8366474: Rename MetaspaceObj::is_shared() to MetaspaceObj::in_aot_cache() #27016

8366474: Rename MetaspaceObj::is_shared() to MetaspaceObj::in_aot_cache() #27016

Uh oh!

Conversation

iklam commented Aug 30, 2025 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented Aug 30, 2025

Uh oh!

openjdk bot commented Aug 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openjdk bot commented Aug 30, 2025

Uh oh!

mlbridge bot commented Aug 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

vnkozlov Aug 30, 2025

Choose a reason for hiding this comment

Uh oh!

vnkozlov Aug 30, 2025

Choose a reason for hiding this comment

Uh oh!

vnkozlov Aug 30, 2025

Choose a reason for hiding this comment

Uh oh!

iklam Aug 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

vnkozlov left a comment

Choose a reason for hiding this comment

Uh oh!

vnkozlov left a comment

Choose a reason for hiding this comment

Uh oh!

dholmes-ora commented Sep 1, 2025

Uh oh!

iklam commented Sep 2, 2025

Uh oh!

liach left a comment

Choose a reason for hiding this comment

Uh oh!

openjdk bot commented Sep 4, 2025

Uh oh!

iklam commented Sep 4, 2025

Uh oh!

liach left a comment

Choose a reason for hiding this comment

Uh oh!

iklam commented Sep 4, 2025

Uh oh!

openjdk bot commented Sep 4, 2025

Uh oh!

openjdk bot commented Sep 4, 2025

Uh oh!

Uh oh!

iklam commented Aug 30, 2025 •

edited by openjdk bot

Loading

openjdk bot commented Aug 30, 2025 •

edited

Loading

mlbridge bot commented Aug 30, 2025 •

edited

Loading

iklam Aug 30, 2025 •

edited

Loading