8366475: Rename MetaspaceShared class to AOTMetaspace #27017

iklam · 2025-08-30T02:21:32Z

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

Rename this class to with a naming convention that's consistent with other new AOT classes such as AOTClassLinker.

All changes are mechanical text replacement. Headers are resorted alphabetically.

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-8366475: Rename MetaspaceShared class to AOTMetaspace (Sub-task - P4)

Reviewers

Vladimir Kozlov (@vnkozlov - Reviewer)
Ashutosh Mehra (@ashu-mehra - Committer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 27017

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

Using diff file

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

Using Webrev

Link to Webrev Comment

…he()

bridgekeeper · 2025-08-30T02:22:10Z

👋 Welcome back iklam! A progress list of the required criteria for merging this PR into pr/27016 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:22:45Z

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

8366475: Rename MetaspaceShared class to AOTMetaspace

Reviewed-by: kvn, asmehra

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

79a1a98: 8366498: Simplify ClassFileParser::parse_super_class
e190355: 8365467: Issues with jrtfs implementation for exploded run-time images
80873a0: 8366836: Don't execute post-IncludeCustomExtension if file was not included
... and 10 more: https://git.openjdk.org/jdk/compare/90a2db1ecbc3ea25a8e9f15b34a3d8f3941b60d0...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.

openjdk · 2025-08-30T02:23:28Z

@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:27:24Z

Webrevs

src/hotspot/share/oops/symbol.cpp

src/hotspot/share/oops/trainingData.cpp

vnkozlov

Good.

src/hotspot/share/prims/whitebox.cpp

vnkozlov · 2025-08-30T14:15:09Z

@stefank also asked about INCLUDE_CDS to replace it with INCLUDE_AOT. Should we do this?

…penjdk#27017

…into 8366475-rename-metaspace-shared-to-aot-metaspace

vnkozlov

Good.

ashu-mehra · 2025-09-04T01:47:23Z

src/hotspot/os/posix/vmError_posix.cpp

@@ -24,7 +24,7 @@
 */

 #include "cds/cdsConfig.hpp"
-#include "cds/metaspaceShared.hpp"
+#include "cds/aotMetaspace.hpp"


There are few places, like this, where the header files are no longer in sorted order. Can you please update them.

ashu-mehra · 2025-09-04T01:47:27Z

src/hotspot/os/windows/vmError_windows.cpp

@@ -23,7 +23,7 @@
 */

 #include "cds/cdsConfig.hpp"
-#include "cds/metaspaceShared.hpp"
+#include "cds/aotMetaspace.hpp"


header files are not sorted

ashu-mehra · 2025-09-04T01:48:00Z

src/hotspot/share/prims/jvm.cpp

@@ -3504,7 +3504,7 @@ JVM_ENTRY(void, JVM_DumpClassListToFile(JNIEnv *env, jstring listFileName))
  ResourceMark rm(THREAD);
  Handle file_handle(THREAD, JNIHandles::resolve_non_null(listFileName));
  char* file_name  = java_lang_String::as_utf8_string(file_handle());
-  MetaspaceShared::dump_loaded_classes(file_name, THREAD);
+  AOTMetaspace::dump_loaded_classes(file_name, THREAD);


Shouldn't this file include aotMetaspace.hpp directly?

ashu-mehra · 2025-09-04T01:48:04Z

src/hotspot/share/prims/jvmtiRedefineClasses.cpp

@@ -23,7 +23,7 @@
 */

 #include "cds/cdsConfig.hpp"
-#include "cds/metaspaceShared.hpp"
+#include "cds/aotMetaspace.hpp"


headers are not sorted

ashu-mehra · 2025-09-04T01:48:07Z

src/hotspot/share/prims/whitebox.cpp

@@ -27,7 +27,7 @@
 #include "cds/cdsConstants.hpp"
 #include "cds/filemap.hpp"
 #include "cds/heapShared.hpp"
-#include "cds/metaspaceShared.hpp"
+#include "cds/aotMetaspace.hpp"


header files are not sorted

ashu-mehra · 2025-09-04T01:48:11Z

src/hotspot/share/runtime/java.cpp

@@ -448,7 +448,7 @@ void before_exit(JavaThread* thread, bool halt) {
  ClassListWriter::write_resolved_constants();

  if (CDSConfig::is_dumping_preimage_static_archive()) {
-    MetaspaceShared::preload_and_dump(thread);
+    AOTMetaspace::preload_and_dump(thread);


Shouldn't this file include aotMetaspace.hpp directly?

ashu-mehra · 2025-09-04T01:48:14Z

src/hotspot/share/runtime/threads.cpp

@@ -28,7 +28,7 @@
 #include "cds/cds_globals.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/heapShared.hpp"
-#include "cds/metaspaceShared.hpp"
+#include "cds/aotMetaspace.hpp"


header files are not sorted

…n_aot_cache

…j::is_shared()

openjdk-notifier · 2025-09-04T04:53:03Z

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout 8366475-rename-metaspace-shared-to-aot-metaspace
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

openjdk · 2025-09-04T04:53:38Z

@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 8366475-rename-metaspace-shared-to-aot-metaspace
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

openjdk · 2025-09-04T04:53:43Z

⚠️ @iklam This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

…into 8366475-rename-metaspace-shared-to-aot-metaspace

…aspace

ashu-mehra

lgtm

ashu-mehra · 2025-09-04T13:59:15Z

@iklam thanks for addressing the comments.

vnkozlov

Re-approved

iklam · 2025-09-04T16:22:15Z

Thanks @vnkozlov @ashu-mehra for the review
/integrate

openjdk · 2025-09-04T16:23:52Z

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

79a1a98: 8366498: Simplify ClassFileParser::parse_super_class
e190355: 8365467: Issues with jrtfs implementation for exploded run-time images
80873a0: 8366836: Don't execute post-IncludeCustomExtension if file was not included
... and 10 more: https://git.openjdk.org/jdk/compare/90a2db1ecbc3ea25a8e9f15b34a3d8f3941b60d0...master

Your commit was automatically rebased without conflicts.

openjdk · 2025-09-04T16:24:04Z

@iklam Pushed as commit f90d520.

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

iklam added 2 commits August 29, 2025 18:54

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

4c68981

…he()

Rename MetaspaceShared -> AOTMetaspace

fc63ba0

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

8366477: Refactor AOT-related flag bits in klass.hpp #27018

Closed

3 tasks

vnkozlov reviewed Aug 30, 2025

View reviewed changes

src/hotspot/share/oops/symbol.cpp Outdated Show resolved Hide resolved

vnkozlov reviewed Aug 30, 2025

View reviewed changes

src/hotspot/share/oops/trainingData.cpp Outdated Show resolved Hide resolved

vnkozlov reviewed Aug 30, 2025

View reviewed changes

src/hotspot/share/prims/whitebox.cpp Show resolved Hide resolved

iklam added 3 commits August 30, 2025 10:29

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

6b8a1b0

…penjdk#27017

Merge branch '8366474-rename_metaspaceobj_is_shared_to_in_aot_cache' …

baebf0a

…into 8366475-rename-metaspace-shared-to-aot-metaspace

Redo changes in comments and tests

0a42593

iklam mentioned this pull request Aug 30, 2025

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

Closed

3 tasks

removed unnecessary includes

0cadae4

vnkozlov approved these changes Aug 30, 2025

View reviewed changes

ashu-mehra reviewed Sep 4, 2025

View reviewed changes

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-notifier bot changed the base branch from pr/27016 to master September 4, 2025 04:53

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

iklam added 2 commits September 3, 2025 21:54

Merge branch '8366474-rename_metaspaceobj_is_shared_to_in_aot_cache' …

52de307

…into 8366475-rename-metaspace-shared-to-aot-metaspace

Merge branch 'master' into 8366475-rename-metaspace-shared-to-aot-met…

a2bcb4f

…aspace

Fixed include order

63073fe

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

ashu-mehra approved these changes Sep 4, 2025

View reviewed changes

vnkozlov 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

8366475: Rename MetaspaceShared class to AOTMetaspace #27017

8366475: Rename MetaspaceShared class to AOTMetaspace #27017

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!

Uh oh!

Uh oh!

vnkozlov left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

vnkozlov commented Aug 30, 2025

Uh oh!

vnkozlov left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

openjdk-notifier bot commented Sep 4, 2025

Uh oh!

openjdk bot commented Sep 4, 2025

Uh oh!

openjdk bot commented Sep 4, 2025

Uh oh!

ashu-mehra left a comment

Choose a reason for hiding this comment

Uh oh!

ashu-mehra commented Sep 4, 2025

Uh oh!

vnkozlov 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

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