RFR: 8366475: Rename MetaspaceShared class to AOTMetaspace [v3]

[Ioi Lam]

On Thu, 4 Sep 2025 01:47:23 GMT, Ashutosh Mehra <asmehra at openjdk.org> wrote:

>> Ioi Lam has updated the pull request incrementally with one additional commit since the last revision:
>> 
>>   removed unnecessary includes
>
> src/hotspot/os/posix/vmError_posix.cpp line 27:
> 
>> 25: 
>> 26: #include "cds/cdsConfig.hpp"
>> 27: #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.

Fixed.

> src/hotspot/os/windows/vmError_windows.cpp line 26:
> 
>> 24: 
>> 25: #include "cds/cdsConfig.hpp"
>> 26: #include "cds/aotMetaspace.hpp"
> 
> header files are not sorted

Fixed.

> src/hotspot/share/prims/jvm.cpp line 3507:
> 
>> 3505:   Handle file_handle(THREAD, JNIHandles::resolve_non_null(listFileName));
>> 3506:   char* file_name  = java_lang_String::as_utf8_string(file_handle());
>> 3507:   AOTMetaspace::dump_loaded_classes(file_name, THREAD);
> 
> Shouldn't this file include `aotMetaspace.hpp` directly?

Fixed.

> src/hotspot/share/prims/jvmtiRedefineClasses.cpp line 26:
> 
>> 24: 
>> 25: #include "cds/cdsConfig.hpp"
>> 26: #include "cds/aotMetaspace.hpp"
> 
> headers are not sorted

Fixed.

> src/hotspot/share/prims/whitebox.cpp line 30:
> 
>> 28: #include "cds/filemap.hpp"
>> 29: #include "cds/heapShared.hpp"
>> 30: #include "cds/aotMetaspace.hpp"
> 
> header files are not sorted

Fixed.

> src/hotspot/share/runtime/java.cpp line 451:
> 
>> 449: 
>> 450:   if (CDSConfig::is_dumping_preimage_static_archive()) {
>> 451:     AOTMetaspace::preload_and_dump(thread);
> 
> Shouldn't this file include `aotMetaspace.hpp` directly?

Fixed.

> src/hotspot/share/runtime/threads.cpp line 31:
> 
>> 29: #include "cds/cdsConfig.hpp"
>> 30: #include "cds/heapShared.hpp"
>> 31: #include "cds/aotMetaspace.hpp"
> 
> header files are not sorted

Fixed.

-------------

PR Review Comment: https://git.openjdk.org/jdk/pull/27017#discussion_r2320880870
PR Review Comment: https://git.openjdk.org/jdk/pull/27017#discussion_r2320880937
PR Review Comment: https://git.openjdk.org/jdk/pull/27017#discussion_r2320880998
PR Review Comment: https://git.openjdk.org/jdk/pull/27017#discussion_r2320881088
PR Review Comment: https://git.openjdk.org/jdk/pull/27017#discussion_r2320881141
PR Review Comment: https://git.openjdk.org/jdk/pull/27017#discussion_r2320881190
PR Review Comment: https://git.openjdk.org/jdk/pull/27017#discussion_r2320881262