8265696: Move CDS sources to src/hotspot/shared/cds

Reviewed-by: erikj, dholmes, stuefe

make/hotspot/lib/JvmFeatures.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -116,23 +116,10 @@ endif
 ifneq ($(call check-jvm-feature, cds), true)
   JVM_CFLAGS_FEATURES += -DINCLUDE_CDS=0
   JVM_EXCLUDE_FILES += \
-      archiveBuilder.cpp \
-      archiveUtils.cpp \
-      classListParser.cpp \
       classLoaderDataShared.cpp \
       classLoaderExt.cpp \
-      cppVtables.cpp \
-      dumpAllocStats.cpp \
-      dynamicArchive.cpp \
-      filemap.cpp \
-      heapShared.cpp \
-      lambdaFormInvokers.cpp \
-      metaspaceShared.cpp \
-      metaspaceShared_$(HOTSPOT_TARGET_CPU).cpp \
-      metaspaceShared_$(HOTSPOT_TARGET_CPU_ARCH).cpp \
-      sharedClassUtil.cpp \
-      sharedPathsMiscInfo.cpp \
       systemDictionaryShared.cpp
+  JVM_EXCLUDE_PATTERNS += cds/
 endif
 
 ifneq ($(call check-jvm-feature, nmt), true)

src/hotspot/os/aix/os_aix.cpp

@@ -42,7 +42,6 @@
 #include "libodm_aix.hpp"
 #include "loadlib_aix.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/filemap.hpp"
 #include "misc_aix.hpp"
 #include "oops/oop.inline.hpp"
 #include "os_aix.inline.hpp"

src/hotspot/os/bsd/os_bsd.cpp

@@ -34,7 +34,6 @@
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/filemap.hpp"
 #include "oops/oop.inline.hpp"
 #include "os_bsd.inline.hpp"
 #include "os_posix.inline.hpp"

src/hotspot/os/linux/os_linux.cpp

@@ -34,7 +34,6 @@
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/filemap.hpp"
 #include "oops/oop.inline.hpp"
 #include "os_linux.inline.hpp"
 #include "os_posix.inline.hpp"

src/hotspot/os/posix/vmError_posix.cpp

@@ -24,7 +24,7 @@
  */
 
 #include "precompiled.hpp"
-#include "memory/metaspaceShared.hpp"
+#include "cds/metaspaceShared.hpp"
 #include "runtime/os.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "runtime/thread.hpp"

src/hotspot/os/windows/os_windows.cpp

@@ -39,7 +39,6 @@
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/filemap.hpp"
 #include "oops/oop.inline.hpp"
 #include "os_share_windows.hpp"
 #include "os_windows.inline.hpp"

src/hotspot/os/windows/vmError_windows.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
  */
 
 #include "precompiled.hpp"
-#include "memory/metaspaceShared.hpp"
+#include "cds/metaspaceShared.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/os.hpp"
 #include "runtime/thread.hpp"

src/hotspot/os_cpu/bsd_aarch64/thread_bsd_aarch64.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "precompiled.hpp"
-#include "memory/metaspaceShared.hpp"
+#include "cds/metaspaceShared.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/thread.inline.hpp"
 

src/hotspot/os_cpu/bsd_x86/thread_bsd_x86.cpp

@@ -23,7 +23,6 @@
  */
 
 #include "precompiled.hpp"
-#include "memory/metaspaceShared.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/thread.inline.hpp"
 

src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.cpp

@@ -24,7 +24,6 @@
  */
 
 #include "precompiled.hpp"
-#include "memory/metaspaceShared.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/thread.inline.hpp"
 

src/hotspot/os_cpu/linux_arm/thread_linux_arm.cpp

@@ -27,7 +27,6 @@
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/cardTableBarrierSet.inline.hpp"
 #include "gc/shared/collectedHeap.hpp"
-#include "memory/metaspaceShared.hpp"
 #include "memory/universe.hpp"
 #include "runtime/frame.inline.hpp"
 

src/hotspot/os_cpu/linux_x86/thread_linux_x86.cpp

@@ -23,7 +23,6 @@
  */
 
 #include "precompiled.hpp"
-#include "memory/metaspaceShared.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/thread.inline.hpp"
 

src/hotspot/os_cpu/windows_aarch64/thread_windows_aarch64.cpp

@@ -23,7 +23,6 @@
  */
 
 #include "precompiled.hpp"
-#include "memory/metaspaceShared.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/thread.inline.hpp"
 

src/hotspot/os_cpu/windows_x86/thread_windows_x86.cpp

@@ -23,7 +23,6 @@
  */
 
 #include "precompiled.hpp"
-#include "memory/metaspaceShared.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/thread.inline.hpp"
 

src/hotspot/share/cds/archiveBuilder.cpp

@@ -23,6 +23,11 @@
  */
 
 #include "precompiled.hpp"
+#include "cds/archiveBuilder.hpp"
+#include "cds/archiveUtils.hpp"
+#include "cds/cppVtables.hpp"
+#include "cds/dumpAllocStats.hpp"
+#include "cds/metaspaceShared.hpp"
 #include "classfile/classLoaderDataShared.hpp"
 #include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionaryShared.hpp"
@@ -31,12 +36,7 @@
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/allStatic.hpp"
-#include "memory/archiveBuilder.hpp"
-#include "memory/archiveUtils.hpp"
-#include "memory/cppVtables.hpp"
-#include "memory/dumpAllocStats.hpp"
 #include "memory/memRegion.hpp"
-#include "memory/metaspaceShared.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/objArrayKlass.hpp"

src/hotspot/share/cds/archiveBuilder.hpp

@@ -22,11 +22,11 @@
  *
  */
 
-#ifndef SHARE_MEMORY_ARCHIVEBUILDER_HPP
-#define SHARE_MEMORY_ARCHIVEBUILDER_HPP
+#ifndef SHARE_CDS_ARCHIVEBUILDER_HPP
+#define SHARE_CDS_ARCHIVEBUILDER_HPP
 
-#include "memory/archiveUtils.hpp"
-#include "memory/dumpAllocStats.hpp"
+#include "cds/archiveUtils.hpp"
+#include "cds/dumpAllocStats.hpp"
 #include "memory/metaspaceClosure.hpp"
 #include "oops/array.hpp"
 #include "oops/klass.hpp"
@@ -430,4 +430,4 @@ public:
   void report_out_of_space(const char* name, size_t needed_bytes);
 };
 
-#endif // SHARE_MEMORY_ARCHIVEBUILDER_HPP
+#endif // SHARE_CDS_ARCHIVEBUILDER_HPP

src/hotspot/share/cds/archiveUtils.cpp

@@ -23,17 +23,17 @@
  */
 
 #include "precompiled.hpp"
-#include "classfile/classListParser.hpp"
-#include "classfile/classListWriter.hpp"
+#include "cds/archiveBuilder.hpp"
+#include "cds/archiveUtils.hpp"
+#include "cds/classListParser.hpp"
+#include "cds/classListWriter.hpp"
+#include "cds/dynamicArchive.hpp"
+#include "cds/filemap.hpp"
+#include "cds/heapShared.inline.hpp"
+#include "cds/metaspaceShared.hpp"
 #include "classfile/systemDictionaryShared.hpp"
 #include "classfile/vmClasses.hpp"
 #include "interpreter/bootstrapInfo.hpp"
-#include "memory/archiveBuilder.hpp"
-#include "memory/archiveUtils.hpp"
-#include "memory/dynamicArchive.hpp"
-#include "memory/filemap.hpp"
-#include "memory/heapShared.inline.hpp"
-#include "memory/metaspaceShared.hpp"
 #include "memory/metaspaceUtils.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/compressedOops.inline.hpp"

src/hotspot/share/cds/archiveUtils.hpp

@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_MEMORY_ARCHIVEUTILS_HPP
-#define SHARE_MEMORY_ARCHIVEUTILS_HPP
+#ifndef SHARE_CDS_ARCHIVEUTILS_HPP
+#define SHARE_CDS_ARCHIVEUTILS_HPP
 
 #include "logging/log.hpp"
 #include "memory/iterator.hpp"
@@ -227,4 +227,4 @@ public:
   static void log_to_classlist(BootstrapInfo* bootstrap_specifier, TRAPS) NOT_CDS_RETURN;
 };
 
-#endif // SHARE_MEMORY_ARCHIVEUTILS_HPP
+#endif // SHARE_CDS_ARCHIVEUTILS_HPP

src/hotspot/share/cds/archiveUtils.inline.hpp

@@ -22,10 +22,10 @@
  *
  */
 
-#ifndef SHARE_MEMORY_ARCHIVEUTILS_INLINE_HPP
-#define SHARE_MEMORY_ARCHIVEUTILS_INLINE_HPP
+#ifndef SHARE_CDS_ARCHIVEUTILS_INLINE_HPP
+#define SHARE_CDS_ARCHIVEUTILS_INLINE_HPP
 
-#include "memory/archiveUtils.hpp"
+#include "cds/archiveUtils.hpp"
 #include "utilities/bitMap.inline.hpp"
 
 inline bool SharedDataRelocator::do_bit(size_t offset) {
@@ -46,4 +46,4 @@ inline bool SharedDataRelocator::do_bit(size_t offset) {
   return true; // keep iterating
 }
 
-#endif // SHARE_MEMORY_ARCHIVEUTILS_INLINE_HPP
+#endif // SHARE_CDS_ARCHIVEUTILS_INLINE_HPP

src/hotspot/share/cds/cdsoffsets.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,14 +23,13 @@
  */
 
 #include "precompiled.hpp"
-#include "utilities/macros.hpp"
-#if INCLUDE_CDS
+#include "cds/cdsoffsets.hpp"
+#include "cds/dynamicArchive.hpp"
+#include "cds/filemap.hpp"
 #include "runtime/os.hpp"
-#include "memory/dynamicArchive.hpp"
-#include "memory/filemap.hpp"
 #include "memory/allocation.hpp"
 #include "memory/allocation.inline.hpp"
-#include "prims/cdsoffsets.hpp"
+#include "utilities/macros.hpp"
 
 CDSOffsets::CDSOffsets(const char* name, int offset, CDSOffsets* next) {
   _name = NEW_C_HEAP_ARRAY(char, strlen(name) + 1, mtInternal);
@@ -76,4 +75,3 @@ void CDSOffsets::add_end(CDSOffsets* n) {
   while(p && p->_next) { p = p->_next; }
   p->_next = n;
 }
-#endif // INCLUDE_CDS

src/hotspot/share/cds/cdsoffsets.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,10 @@
  *
  */
 
-#ifndef SHARE_PRIMS_CDSOFFSETS_HPP
-#define SHARE_PRIMS_CDSOFFSETS_HPP
+#ifndef SHARE_CDS_CDSOFFSETS_HPP
+#define SHARE_CDS_CDSOFFSETS_HPP
+
+#include "memory/allocation.hpp"
 
 class CDSOffsets: public CHeapObj<mtInternal> {
  private:
@@ -42,4 +44,4 @@ class CDSOffsets: public CHeapObj<mtInternal> {
   static int find_offset(const char* name);
 };
 
-#endif // SHARE_PRIMS_CDSOFFSETS_HPP
+#endif // SHARE_CDS_CDSOFFSETS_HPP

src/hotspot/share/cds/classListParser.cpp

@@ -25,10 +25,12 @@
 #include "precompiled.hpp"
 #include "jvm.h"
 #include "jimage.hpp"
-#include "classfile/classListParser.hpp"
+#include "cds/archiveUtils.hpp"
+#include "cds/classListParser.hpp"
+#include "cds/lambdaFormInvokers.hpp"
+#include "cds/metaspaceShared.hpp"
 #include "classfile/classLoaderExt.hpp"
 #include "classfile/javaClasses.inline.hpp"
-#include "classfile/lambdaFormInvokers.hpp"
 #include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "classfile/systemDictionaryShared.hpp"
@@ -39,8 +41,6 @@
 #include "interpreter/linkResolver.hpp"
 #include "logging/log.hpp"
 #include "logging/logTag.hpp"
-#include "memory/archiveUtils.hpp"
-#include "memory/metaspaceShared.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/constantPool.hpp"
 #include "runtime/atomic.hpp"

src/hotspot/share/cds/classListParser.hpp

@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_CLASSFILE_CLASSLISTPARSER_HPP
-#define SHARE_CLASSFILE_CLASSLISTPARSER_HPP
+#ifndef SHARE_CDS_CLASSLISTPARSER_HPP
+#define SHARE_CDS_CLASSLISTPARSER_HPP
 
 #include "utilities/exceptions.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -183,4 +183,4 @@ public:
 
   static void populate_cds_indy_info(const constantPoolHandle &pool, int cp_index, CDSIndyInfo* cii, TRAPS);
 };
-#endif // SHARE_CLASSFILE_CLASSLISTPARSER_HPP
+#endif // SHARE_CDS_CLASSLISTPARSER_HPP

src/hotspot/share/cds/classListWriter.hpp

@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_CLASSFILE_CLASSLISTWRITER_HPP
-#define SHARE_CLASSFILE_CLASSLISTWRITER_HPP
+#ifndef SHARE_CDS_CLASSLISTWRITER_HPP
+#define SHARE_CDS_CLASSLISTWRITER_HPP
 
 #include "runtime/mutexLocker.hpp"
 #include "runtime/thread.hpp"
@@ -79,4 +79,4 @@ public:
   }
 };
 
-#endif // SHARE_CLASSFILE_CLASSLISTWRITER_HPP
+#endif // SHARE_CDS_CLASSLISTWRITER_HPP

src/hotspot/share/cds/cppVtables.cpp

@@ -23,11 +23,11 @@
  */
 
 #include "precompiled.hpp"
+#include "cds/archiveUtils.hpp"
+#include "cds/archiveBuilder.hpp"
+#include "cds/cppVtables.hpp"
+#include "cds/metaspaceShared.hpp"
 #include "logging/log.hpp"
-#include "memory/archiveUtils.hpp"
-#include "memory/archiveBuilder.hpp"
-#include "memory/cppVtables.hpp"
-#include "memory/metaspaceShared.hpp"
 #include "oops/instanceClassLoaderKlass.hpp"
 #include "oops/instanceMirrorKlass.hpp"
 #include "oops/instanceRefKlass.hpp"

src/hotspot/share/cds/cppVtables.hpp

@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_MEMORY_CPPVTABLES_HPP
-#define SHARE_MEMORY_CPPVTABLES_HPP
+#ifndef SHARE_CDS_CPPVTABLES_HPP
+#define SHARE_CDS_CPPVTABLES_HPP
 
 #include "memory/allocation.hpp"
 #include "memory/allStatic.hpp"
@@ -45,4 +45,4 @@ public:
   static bool is_valid_shared_method(const Method* m) NOT_CDS_RETURN_(false);
 };
 
-#endif // SHARE_MEMORY_CPPVTABLES_HPP
+#endif // SHARE_CDS_CPPVTABLES_HPP

src/hotspot/share/cds/dumpAllocStats.cpp

@@ -23,9 +23,9 @@
  */
 
 #include "precompiled.hpp"
+#include "cds/dumpAllocStats.hpp"
 #include "logging/log.hpp"
 #include "logging/logMessage.hpp"
-#include "memory/dumpAllocStats.hpp"
 
 void DumpAllocStats::print_stats(int ro_all, int rw_all) {
   // symbols

src/hotspot/share/cds/dumpAllocStats.hpp

@@ -22,11 +22,11 @@
  *
  */
 
-#ifndef SHARE_MEMORY_DUMPALLOCSTATS_HPP
-#define SHARE_MEMORY_DUMPALLOCSTATS_HPP
+#ifndef SHARE_CDS_DUMPALLOCSTATS_HPP
+#define SHARE_CDS_DUMPALLOCSTATS_HPP
 
-#include "memory/allocation.hpp"
 #include "classfile/compactHashtable.hpp"
+#include "memory/allocation.hpp"
 
 // This is for dumping detailed statistics for the allocations
 // in the shared spaces.
@@ -100,4 +100,4 @@ public:
   void print_stats(int ro_all, int rw_all);
 };
 
-#endif // SHARE_MEMORY_DUMPALLOCSTATS_HPP
+#endif // SHARE_CDS_DUMPALLOCSTATS_HPP

src/hotspot/share/cds/dynamicArchive.cpp

@@ -24,6 +24,10 @@
 
 #include "precompiled.hpp"
 #include "jvm.h"
+#include "cds/archiveBuilder.hpp"
+#include "cds/archiveUtils.inline.hpp"
+#include "cds/dynamicArchive.hpp"
+#include "cds/metaspaceShared.hpp"
 #include "classfile/classLoaderData.inline.hpp"
 #include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionaryShared.hpp"
@@ -32,11 +36,7 @@
 #include "gc/shared/gcVMOperations.hpp"
 #include "gc/shared/gc_globals.hpp"
 #include "logging/log.hpp"
-#include "memory/archiveBuilder.hpp"
-#include "memory/archiveUtils.inline.hpp"
-#include "memory/dynamicArchive.hpp"
 #include "memory/metaspaceClosure.hpp"
-#include "memory/metaspaceShared.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/klass.inline.hpp"
 #include "runtime/arguments.hpp"

src/hotspot/share/cds/dynamicArchive.hpp

@@ -22,14 +22,12 @@
  *
  */
 
-#ifndef SHARE_VM_MEMORY_DYNAMICARCHIVE_HPP
-#define SHARE_VM_MEMORY_DYNAMICARCHIVE_HPP
-
-#if INCLUDE_CDS
+#ifndef SHARE_CDS_DYNAMICARCHIVE_HPP
+#define SHARE_CDS_DYNAMICARCHIVE_HPP
 
+#include "cds/filemap.hpp"
 #include "classfile/compactHashtable.hpp"
 #include "memory/allocation.hpp"
-#include "memory/filemap.hpp"
 #include "memory/memRegion.hpp"
 #include "memory/virtualspace.hpp"
 #include "oops/oop.hpp"
@@ -37,6 +35,8 @@
 #include "utilities/macros.hpp"
 #include "utilities/resourceHash.hpp"
 
+#if INCLUDE_CDS
+
 class DynamicArchiveHeader : public FileMapHeader {
   friend class CDSOffsets;
 private:
@@ -68,4 +68,4 @@ public:
   static bool validate(FileMapInfo* dynamic_info);
 };
 #endif // INCLUDE_CDS
-#endif // SHARE_VM_MEMORY_DYNAMICARCHIVE_HPP
+#endif // SHARE_CDS_DYNAMICARCHIVE_HPP

src/hotspot/share/cds/filemap.cpp

@@ -24,6 +24,12 @@
 
 #include "precompiled.hpp"
 #include "jvm.h"
+#include "cds/archiveBuilder.hpp"
+#include "cds/archiveUtils.inline.hpp"
+#include "cds/dynamicArchive.hpp"
+#include "cds/filemap.hpp"
+#include "cds/heapShared.inline.hpp"
+#include "cds/metaspaceShared.hpp"
 #include "classfile/altHashing.hpp"
 #include "classfile/classFileStream.hpp"
 #include "classfile/classLoader.inline.hpp"
@@ -36,15 +42,9 @@
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "logging/logMessage.hpp"
-#include "memory/archiveBuilder.hpp"
-#include "memory/archiveUtils.inline.hpp"
-#include "memory/dynamicArchive.hpp"
-#include "memory/filemap.hpp"
-#include "memory/heapShared.inline.hpp"
 #include "memory/iterator.inline.hpp"
 #include "memory/metadataFactory.hpp"
 #include "memory/metaspaceClosure.hpp"
-#include "memory/metaspaceShared.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/universe.hpp"
 #include "oops/compressedOops.hpp"

src/hotspot/share/cds/filemap.hpp

@@ -22,11 +22,12 @@
  *
  */
 
-#ifndef SHARE_MEMORY_FILEMAP_HPP
-#define SHARE_MEMORY_FILEMAP_HPP
+#ifndef SHARE_CDS_FILEMAP_HPP
+#define SHARE_CDS_FILEMAP_HPP
 
+#include "cds/metaspaceShared.hpp"
 #include "include/cds.h"
-#include "memory/metaspaceShared.hpp"
+#include "oops/array.hpp"
 #include "oops/compressedOops.hpp"
 #include "utilities/align.hpp"
 
@@ -594,4 +595,4 @@ public:
 #endif
 };
 
-#endif // SHARE_MEMORY_FILEMAP_HPP
+#endif // SHARE_CDS_FILEMAP_HPP

src/hotspot/share/cds/heapShared.cpp

@@ -23,6 +23,11 @@
  */
 
 #include "precompiled.hpp"
+#include "cds/archiveBuilder.hpp"
+#include "cds/archiveUtils.hpp"
+#include "cds/filemap.hpp"
+#include "cds/heapShared.inline.hpp"
+#include "cds/metaspaceShared.hpp"
 #include "classfile/classLoaderData.hpp"
 #include "classfile/classLoaderDataShared.hpp"
 #include "classfile/javaClasses.inline.hpp"
@@ -38,14 +43,9 @@
 #include "logging/log.hpp"
 #include "logging/logMessage.hpp"
 #include "logging/logStream.hpp"
-#include "memory/archiveBuilder.hpp"
-#include "memory/archiveUtils.hpp"
-#include "memory/filemap.hpp"
-#include "memory/heapShared.inline.hpp"
 #include "memory/iterator.inline.hpp"
 #include "memory/metadataFactory.hpp"
 #include "memory/metaspaceClosure.hpp"
-#include "memory/metaspaceShared.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "oops/compressedOops.inline.hpp"

src/hotspot/share/cds/heapShared.hpp

@@ -22,15 +22,15 @@
  *
  */
 
-#ifndef SHARE_MEMORY_HEAPSHARED_HPP
-#define SHARE_MEMORY_HEAPSHARED_HPP
+#ifndef SHARE_CDS_HEAPSHARED_HPP
+#define SHARE_CDS_HEAPSHARED_HPP
 
+#include "cds/metaspaceShared.hpp"
 #include "classfile/compactHashtable.hpp"
 #include "classfile/javaClasses.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "gc/shared/gc_globals.hpp"
 #include "memory/allocation.hpp"
-#include "memory/metaspaceShared.hpp"
 #include "oops/compressedOops.hpp"
 #include "oops/objArrayKlass.hpp"
 #include "oops/oop.hpp"
@@ -415,4 +415,4 @@ class DumpedInternedStrings :
 {};
 #endif
 
-#endif // SHARE_MEMORY_HEAPSHARED_HPP
+#endif // SHARE_CDS_HEAPSHARED_HPP

src/hotspot/share/cds/heapShared.inline.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,12 @@
  *
  */
 
-#ifndef SHARE_MEMORY_HEAPSHARED_INLINE_HPP
-#define SHARE_MEMORY_HEAPSHARED_INLINE_HPP
+#ifndef SHARE_CDS_HEAPSHARED_INLINE_HPP
+#define SHARE_CDS_HEAPSHARED_INLINE_HPP
 
+#include "cds/heapShared.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
-#include "memory/heapShared.hpp"
 #include "utilities/align.hpp"
 
 #if INCLUDE_CDS_JAVA_HEAP
@@ -45,4 +45,4 @@ inline oop HeapShared::decode_from_archive(narrowOop v) {
 
 #endif
 
-#endif // SHARE_MEMORY_HEAPSHARED_INLINE_HPP
+#endif // SHARE_CDS_HEAPSHARED_INLINE_HPP

src/hotspot/share/cds/lambdaFormInvokers.cpp

@@ -23,11 +23,12 @@
  */
 
 #include "precompiled.hpp"
+#include "cds/lambdaFormInvokers.hpp"
+#include "cds/metaspaceShared.hpp"
 #include "classfile/classLoadInfo.hpp"
 #include "classfile/classFileStream.hpp"
 #include "classfile/javaClasses.inline.hpp"
 #include "classfile/klassFactory.hpp"
-#include "classfile/lambdaFormInvokers.hpp"
 #include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "classfile/systemDictionaryShared.hpp"
@@ -35,7 +36,6 @@
 #include "classfile/vmSymbols.hpp"
 #include "logging/log.hpp"
 #include "memory/oopFactory.hpp"
-#include "memory/metaspaceShared.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/klass.hpp"

src/hotspot/share/cds/lambdaFormInvokers.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_MEMORY_LAMBDAFORMINVOKERS_HPP
-#define SHARE_MEMORY_LAMBDAFORMINVOKERS_HPP
+#ifndef SHARE_CDS_LAMBDAFORMINVOKERS_HPP
+#define SHARE_CDS_LAMBDAFORMINVOKERS_HPP
 #include "memory/allStatic.hpp"
 #include "runtime/handles.hpp"
 
@@ -43,4 +43,4 @@ class LambdaFormInvokers : public AllStatic {
     return _lambdaform_lines;
   }
 };
-#endif // SHARE_MEMORY_LAMBDAFORMINVOKERS_HPP
+#endif // SHARE_CDS_LAMBDAFORMINVOKERS_HPP

src/hotspot/share/cds/metaspaceShared.cpp

@@ -24,12 +24,18 @@
 
 #include "precompiled.hpp"
 #include "jvm_io.h"
+#include "cds/archiveBuilder.hpp"
+#include "cds/classListParser.hpp"
+#include "cds/cppVtables.hpp"
+#include "cds/dumpAllocStats.hpp"
+#include "cds/filemap.hpp"
+#include "cds/heapShared.hpp"
+#include "cds/lambdaFormInvokers.hpp"
+#include "cds/metaspaceShared.hpp"
 #include "classfile/classLoaderDataGraph.hpp"
 #include "classfile/classLoaderDataShared.hpp"
-#include "classfile/classListParser.hpp"
 #include "classfile/classLoaderExt.hpp"
 #include "classfile/javaClasses.inline.hpp"
-#include "classfile/lambdaFormInvokers.hpp"
 #include "classfile/loaderConstraints.hpp"
 #include "classfile/placeholders.hpp"
 #include "classfile/symbolTable.hpp"
@@ -45,14 +51,8 @@
 #include "logging/log.hpp"
 #include "logging/logMessage.hpp"
 #include "logging/logStream.hpp"
-#include "memory/archiveBuilder.hpp"
-#include "memory/cppVtables.hpp"
-#include "memory/dumpAllocStats.hpp"
-#include "memory/filemap.hpp"
-#include "memory/heapShared.hpp"
 #include "memory/metaspace.hpp"
 #include "memory/metaspaceClosure.hpp"
-#include "memory/metaspaceShared.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "oops/compressedOops.inline.hpp"

src/hotspot/share/cds/metaspaceShared.hpp

@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_MEMORY_METASPACESHARED_HPP
-#define SHARE_MEMORY_METASPACESHARED_HPP
+#ifndef SHARE_CDS_METASPACESHARED_HPP
+#define SHARE_CDS_METASPACESHARED_HPP
 
 #include "memory/allocation.hpp"
 #include "memory/memRegion.hpp"
@@ -203,4 +203,4 @@ private:
   static MapArchiveResult map_archive(FileMapInfo* mapinfo, char* mapped_base_address, ReservedSpace rs);
   static void unmap_archive(FileMapInfo* mapinfo);
 };
-#endif // SHARE_MEMORY_METASPACESHARED_HPP
+#endif // SHARE_CDS_METASPACESHARED_HPP

src/hotspot/share/classfile/classLoader.cpp

@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "jvm.h"
 #include "jimage.hpp"
+#include "cds/filemap.hpp"
 #include "classfile/classFileStream.hpp"
 #include "classfile/classLoader.inline.hpp"
 #include "classfile/classLoaderData.inline.hpp"
@@ -47,7 +48,6 @@
 #include "logging/logStream.hpp"
 #include "logging/logTag.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/filemap.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"

src/hotspot/share/classfile/classLoaderDataShared.cpp

@@ -23,13 +23,13 @@
  */
 
 #include "precompiled.hpp"
+#include "cds/metaspaceShared.hpp"
 #include "classfile/classLoaderData.inline.hpp"
 #include "classfile/classLoaderDataShared.hpp"
 #include "classfile/moduleEntry.hpp"
 #include "classfile/packageEntry.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "logging/log.hpp"
-#include "memory/metaspaceShared.hpp"
 #include "runtime/handles.inline.hpp"
 
 #if INCLUDE_CDS_JAVA_HEAP

src/hotspot/share/classfile/classLoaderExt.cpp

@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "cds/filemap.hpp"
 #include "classfile/classFileParser.hpp"
 #include "classfile/classFileStream.hpp"
 #include "classfile/classLoader.inline.hpp"
@@ -37,7 +38,6 @@
 #include "gc/shared/collectedHeap.hpp"
 #include "logging/log.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/filemap.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/klass.inline.hpp"

src/hotspot/share/classfile/compactHashtable.cpp

@@ -24,11 +24,11 @@
 
 #include "precompiled.hpp"
 #include "jvm.h"
+#include "cds/archiveBuilder.hpp"
+#include "cds/heapShared.inline.hpp"
 #include "classfile/compactHashtable.hpp"
 #include "classfile/javaClasses.hpp"
 #include "logging/logMessage.hpp"
-#include "memory/archiveBuilder.hpp"
-#include "memory/heapShared.inline.hpp"
 #include "memory/metadataFactory.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/globals.hpp"

src/hotspot/share/classfile/javaClasses.cpp

@@ -24,6 +24,9 @@
 
 #include "precompiled.hpp"
 #include "jvm.h"
+#include "cds/archiveBuilder.hpp"
+#include "cds/heapShared.inline.hpp"
+#include "cds/metaspaceShared.hpp"
 #include "classfile/altHashing.hpp"
 #include "classfile/classLoaderData.inline.hpp"
 #include "classfile/javaClasses.inline.hpp"
@@ -41,9 +44,6 @@
 #include "interpreter/linkResolver.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
-#include "memory/archiveBuilder.hpp"
-#include "memory/heapShared.inline.hpp"
-#include "memory/metaspaceShared.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"

src/hotspot/share/classfile/klassFactory.cpp

@@ -23,6 +23,7 @@
 */
 
 #include "precompiled.hpp"
+#include "cds/filemap.hpp"
 #include "classfile/classFileParser.hpp"
 #include "classfile/classFileStream.hpp"
 #include "classfile/classLoader.hpp"
@@ -30,7 +31,6 @@
 #include "classfile/classLoaderData.inline.hpp"
 #include "classfile/classLoadInfo.hpp"
 #include "classfile/klassFactory.hpp"
-#include "memory/filemap.hpp"
 #include "memory/resourceArea.hpp"
 #include "prims/jvmtiEnvBase.hpp"
 #include "prims/jvmtiRedefineClasses.hpp"

src/hotspot/share/classfile/moduleEntry.cpp

@@ -24,15 +24,15 @@
 
 #include "precompiled.hpp"
 #include "jni.h"
+#include "cds/archiveBuilder.hpp"
+#include "cds/archiveUtils.hpp"
+#include "cds/filemap.hpp"
+#include "cds/heapShared.hpp"
 #include "classfile/classLoader.hpp"
 #include "classfile/classLoaderData.inline.hpp"
 #include "classfile/javaClasses.inline.hpp"
 #include "classfile/moduleEntry.hpp"
 #include "logging/log.hpp"
-#include "memory/archiveBuilder.hpp"
-#include "memory/archiveUtils.hpp"
-#include "memory/filemap.hpp"
-#include "memory/heapShared.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "oops/oopHandle.inline.hpp"

src/hotspot/share/classfile/modules.cpp

@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "jvm.h"
+#include "cds/metaspaceShared.hpp"
 #include "classfile/classFileParser.hpp"
 #include "classfile/classLoader.hpp"
 #include "classfile/classLoaderData.inline.hpp"
@@ -41,7 +42,6 @@
 #include "classfile/vmSymbols.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
-#include "memory/metaspaceShared.hpp"
 #include "memory/resourceArea.hpp"
 #include "prims/jvmtiExport.hpp"
 #include "runtime/globals_extension.hpp"

src/hotspot/share/classfile/packageEntry.cpp

@@ -23,13 +23,13 @@
  */
 
 #include "precompiled.hpp"
+#include "cds/archiveBuilder.hpp"
+#include "cds/archiveUtils.hpp"
 #include "classfile/classLoaderData.hpp"
 #include "classfile/moduleEntry.hpp"
 #include "classfile/packageEntry.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "logging/log.hpp"
-#include "memory/archiveBuilder.hpp"
-#include "memory/archiveUtils.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/array.hpp"
 #include "oops/symbol.hpp"

src/hotspot/share/classfile/stringTable.cpp

@@ -23,6 +23,8 @@
  */
 
 #include "precompiled.hpp"
+#include "cds/archiveBuilder.hpp"
+#include "cds/heapShared.inline.hpp"
 #include "classfile/altHashing.hpp"
 #include "classfile/compactHashtable.hpp"
 #include "classfile/javaClasses.inline.hpp"
@@ -34,8 +36,6 @@
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/archiveBuilder.hpp"
-#include "memory/heapShared.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "oops/access.inline.hpp"

src/hotspot/share/classfile/symbolTable.cpp

@@ -23,14 +23,14 @@
  */
 
 #include "precompiled.hpp"
+#include "cds/archiveBuilder.hpp"
+#include "cds/dynamicArchive.hpp"
 #include "classfile/altHashing.hpp"
 #include "classfile/classLoaderData.hpp"
 #include "classfile/compactHashtable.hpp"
 #include "classfile/javaClasses.hpp"
 #include "classfile/symbolTable.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/archiveBuilder.hpp"
-#include "memory/dynamicArchive.hpp"
 #include "memory/metaspaceClosure.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/oop.inline.hpp"

src/hotspot/share/classfile/systemDictionary.cpp

@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "jvm.h"
 #include "aot/aotLoader.hpp"
+#include "cds/heapShared.hpp"
 #include "classfile/classFileParser.hpp"
 #include "classfile/classFileStream.hpp"
 #include "classfile/classLoader.hpp"
@@ -51,7 +52,6 @@
 #include "jfr/jfrEvents.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
-#include "memory/heapShared.hpp"
 #include "memory/metaspaceClosure.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"

src/hotspot/share/classfile/systemDictionaryShared.cpp

@@ -23,8 +23,14 @@
  */
 
 #include "precompiled.hpp"
+#include "cds/archiveUtils.hpp"
+#include "cds/archiveBuilder.hpp"
+#include "cds/classListParser.hpp"
+#include "cds/dynamicArchive.hpp"
+#include "cds/filemap.hpp"
+#include "cds/heapShared.hpp"
+#include "cds/metaspaceShared.hpp"
 #include "classfile/classFileStream.hpp"
-#include "classfile/classListParser.hpp"
 #include "classfile/classLoader.hpp"
 #include "classfile/classLoaderData.inline.hpp"
 #include "classfile/classLoaderDataGraph.hpp"
@@ -43,14 +49,8 @@
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/allocation.hpp"
-#include "memory/archiveUtils.hpp"
-#include "memory/archiveBuilder.hpp"
-#include "memory/dynamicArchive.hpp"
-#include "memory/filemap.hpp"
-#include "memory/heapShared.hpp"
 #include "memory/metadataFactory.hpp"
 #include "memory/metaspaceClosure.hpp"
-#include "memory/metaspaceShared.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"

src/hotspot/share/classfile/systemDictionaryShared.hpp

@@ -25,10 +25,10 @@
 #ifndef SHARE_CLASSFILE_SYSTEMDICTIONARYSHARED_HPP
 #define SHARE_CLASSFILE_SYSTEMDICTIONARYSHARED_HPP
 
+#include "cds/filemap.hpp"
 #include "classfile/classLoaderData.hpp"
 #include "classfile/packageEntry.hpp"
 #include "classfile/systemDictionary.hpp"
-#include "memory/filemap.hpp"
 #include "oops/klass.hpp"
 #include "oops/oopHandle.hpp"
 

src/hotspot/share/classfile/vmClasses.cpp

@@ -23,13 +23,13 @@
  */
 
 #include "precompiled.hpp"
+#include "cds/heapShared.hpp"
 #include "classfile/classLoader.hpp"
 #include "classfile/classLoaderData.hpp"
 #include "classfile/dictionary.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "classfile/vmClasses.hpp"
 #include "classfile/vmSymbols.hpp"
-#include "memory/heapShared.hpp"
 #include "memory/metaspaceClosure.hpp"
 #include "memory/universe.hpp"
 #include "oops/instanceKlass.hpp"

src/hotspot/share/gc/shared/genCollectedHeap.cpp

@@ -57,7 +57,6 @@
 #include "gc/shared/strongRootsScope.hpp"
 #include "gc/shared/weakProcessor.hpp"
 #include "gc/shared/workgroup.hpp"
-#include "memory/filemap.hpp"
 #include "memory/iterator.hpp"
 #include "memory/metaspace/metaspaceSizesSnapshot.hpp"
 #include "memory/metaspaceCounters.hpp"

src/hotspot/share/gc/shared/generationSpec.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
 #include "precompiled.hpp"
 #include "gc/shared/cardTableRS.hpp"
 #include "gc/shared/generationSpec.hpp"
-#include "memory/filemap.hpp"
 #include "runtime/java.hpp"
 #include "utilities/macros.hpp"
 #if INCLUDE_SERIALGC

src/hotspot/share/interpreter/abstractInterpreter.cpp

@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "asm/macroAssembler.hpp"
 #include "asm/macroAssembler.inline.hpp"
+#include "cds/metaspaceShared.hpp"
 #include "compiler/disassembler.hpp"
 #include "interpreter/bytecodeHistogram.hpp"
 #include "interpreter/bytecodeStream.hpp"
@@ -33,7 +34,6 @@
 #include "interpreter/interp_masm.hpp"
 #include "interpreter/templateTable.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/metaspaceShared.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/arrayOop.hpp"
 #include "oops/constantPool.hpp"

src/hotspot/share/interpreter/linkResolver.cpp

@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "jvm.h"
+#include "cds/archiveUtils.hpp"
 #include "classfile/defaultMethods.hpp"
 #include "classfile/javaClasses.hpp"
 #include "classfile/resolutionErrors.hpp"
@@ -40,7 +41,6 @@
 #include "interpreter/linkResolver.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
-#include "memory/archiveUtils.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/constantPool.hpp"
 #include "oops/cpCache.inline.hpp"

src/hotspot/share/interpreter/rewriter.cpp

@@ -23,12 +23,12 @@
  */
 
 #include "precompiled.hpp"
+#include "cds/metaspaceShared.hpp"
 #include "classfile/vmClasses.hpp"
 #include "interpreter/bytecodes.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/rewriter.hpp"
 #include "memory/metadataFactory.hpp"
-#include "memory/metaspaceShared.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/constantPool.hpp"
 #include "oops/generateOopMap.hpp"

src/hotspot/share/memory/metaspace.cpp

@@ -24,11 +24,11 @@
 
 #include "precompiled.hpp"
 #include "aot/aotLoader.hpp"
+#include "cds/metaspaceShared.hpp"
 #include "classfile/classLoaderData.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
-#include "memory/filemap.hpp"
 #include "memory/classLoaderMetaspace.hpp"
 #include "memory/metaspace.hpp"
 #include "memory/metaspace/chunkHeaderPool.hpp"
@@ -41,7 +41,6 @@
 #include "memory/metaspace/metaspaceSizesSnapshot.hpp"
 #include "memory/metaspace/runningCounters.hpp"
 #include "memory/metaspace/virtualSpaceList.hpp"
-#include "memory/metaspaceShared.hpp"
 #include "memory/metaspaceTracer.hpp"
 #include "memory/metaspaceUtils.hpp"
 #include "memory/resourceArea.hpp"

src/hotspot/share/memory/universe.cpp

@@ -24,6 +24,8 @@
 
 #include "precompiled.hpp"
 #include "aot/aotLoader.hpp"
+#include "cds/heapShared.hpp"
+#include "cds/metaspaceShared.hpp"
 #include "classfile/classLoader.hpp"
 #include "classfile/classLoaderDataGraph.hpp"
 #include "classfile/javaClasses.hpp"
@@ -44,11 +46,9 @@
 #include "gc/shared/tlab_globals.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
-#include "memory/heapShared.hpp"
 #include "memory/metadataFactory.hpp"
 #include "memory/metaspaceClosure.hpp"
 #include "memory/metaspaceCounters.hpp"
-#include "memory/metaspaceShared.hpp"
 #include "memory/metaspaceUtils.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"

src/hotspot/share/oops/constantPool.cpp

@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "jvm.h"
+#include "cds/heapShared.hpp"
 #include "classfile/classLoaderData.hpp"
 #include "classfile/javaClasses.inline.hpp"
 #include "classfile/metadataOnStackMark.hpp"
@@ -36,7 +37,6 @@
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/heapShared.hpp"
 #include "memory/metadataFactory.hpp"
 #include "memory/metaspaceClosure.hpp"
 #include "memory/oopFactory.hpp"

src/hotspot/share/oops/cpCache.cpp

@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "cds/heapShared.hpp"
 #include "classfile/resolutionErrors.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "classfile/vmClasses.hpp"
@@ -33,7 +34,6 @@
 #include "interpreter/rewriter.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
-#include "memory/heapShared.hpp"
 #include "memory/metadataFactory.hpp"
 #include "memory/metaspaceClosure.hpp"
 #include "memory/resourceArea.hpp"

src/hotspot/share/oops/instanceKlass.cpp

@@ -24,10 +24,12 @@
 
 #include "precompiled.hpp"
 #include "jvm.h"
+#include "cds/archiveUtils.hpp"
+#include "cds/classListWriter.hpp"
+#include "cds/metaspaceShared.hpp"
 #include "aot/aotLoader.hpp"
 #include "classfile/classFileParser.hpp"
 #include "classfile/classFileStream.hpp"
-#include "classfile/classListWriter.hpp"
 #include "classfile/classLoader.hpp"
 #include "classfile/classLoaderData.inline.hpp"
 #include "classfile/javaClasses.hpp"
@@ -50,11 +52,9 @@
 #include "logging/logMessage.hpp"
 #include "logging/logStream.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/archiveUtils.hpp"
 #include "memory/iterator.inline.hpp"
 #include "memory/metadataFactory.hpp"
 #include "memory/metaspaceClosure.hpp"
-#include "memory/metaspaceShared.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"

src/hotspot/share/oops/klass.cpp

@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "jvm_io.h"
+#include "cds/heapShared.hpp"
 #include "classfile/classLoaderData.inline.hpp"
 #include "classfile/classLoaderDataGraph.inline.hpp"
 #include "classfile/javaClasses.hpp"
@@ -34,7 +35,6 @@
 #include "classfile/vmSymbols.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
 #include "logging/log.hpp"
-#include "memory/heapShared.hpp"
 #include "memory/metadataFactory.hpp"
 #include "memory/metaspaceClosure.hpp"
 #include "memory/oopFactory.hpp"

src/hotspot/share/oops/klassVtable.cpp

@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "jvm.h"
+#include "cds/metaspaceShared.hpp"
 #include "classfile/classLoaderDataGraph.hpp"
 #include "classfile/javaClasses.hpp"
 #include "classfile/systemDictionary.hpp"
@@ -31,7 +32,6 @@
 #include "interpreter/linkResolver.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
-#include "memory/metaspaceShared.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "oops/instanceKlass.inline.hpp"

src/hotspot/share/oops/method.cpp

@@ -23,6 +23,8 @@
  */
 
 #include "precompiled.hpp"
+#include "cds/cppVtables.hpp"
+#include "cds/metaspaceShared.hpp"
 #include "classfile/classLoaderDataGraph.hpp"
 #include "classfile/metadataOnStackMark.hpp"
 #include "classfile/symbolTable.hpp"
@@ -41,10 +43,8 @@
 #include "logging/logTag.hpp"
 #include "logging/logStream.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/cppVtables.hpp"
 #include "memory/metadataFactory.hpp"
 #include "memory/metaspaceClosure.hpp"
-#include "memory/metaspaceShared.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"

src/hotspot/share/oops/oop.cpp

@@ -23,9 +23,9 @@
  */
 
 #include "precompiled.hpp"
+#include "cds/heapShared.inline.hpp"
 #include "classfile/altHashing.hpp"
 #include "classfile/javaClasses.inline.hpp"
-#include "memory/heapShared.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "oops/access.inline.hpp"

src/hotspot/share/oops/symbol.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 
 
 #include "precompiled.hpp"
+#include "cds/metaspaceShared.hpp"
 #include "classfile/altHashing.hpp"
 #include "classfile/classLoaderData.hpp"
 #include "classfile/vmSymbols.hpp"
@@ -31,7 +32,6 @@
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/metaspaceShared.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "oops/symbol.hpp"

src/hotspot/share/prims/jvm.cpp

@@ -24,9 +24,11 @@
 
 #include "precompiled.hpp"
 #include "jvm.h"
+#include "cds/classListParser.hpp"
+#include "cds/classListWriter.hpp"
+#include "cds/dynamicArchive.hpp"
+#include "cds/heapShared.hpp"
 #include "classfile/classFileStream.hpp"
-#include "classfile/classListParser.hpp"
-#include "classfile/classListWriter.hpp"
 #include "classfile/classLoader.hpp"
 #include "classfile/classLoaderData.hpp"
 #include "classfile/classLoaderData.inline.hpp"
@@ -46,8 +48,6 @@
 #include "interpreter/bytecodeUtils.hpp"
 #include "jfr/jfrEvents.hpp"
 #include "logging/log.hpp"
-#include "memory/dynamicArchive.hpp"
-#include "memory/heapShared.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/referenceType.hpp"
 #include "memory/resourceArea.hpp"

src/hotspot/share/prims/jvmtiRedefineClasses.cpp

@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "aot/aotLoader.hpp"
+#include "cds/metaspaceShared.hpp"
 #include "classfile/classFileStream.hpp"
 #include "classfile/classLoaderDataGraph.hpp"
 #include "classfile/classLoadInfo.hpp"
@@ -41,7 +42,6 @@
 #include "jfr/jfrEvents.hpp"
 #include "logging/logStream.hpp"
 #include "memory/metadataFactory.hpp"
-#include "memory/metaspaceShared.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "oops/annotations.hpp"

src/hotspot/share/prims/whitebox.cpp

@@ -24,6 +24,10 @@
 
 #include "precompiled.hpp"
 #include <new>
+#include "cds/cdsoffsets.hpp"
+#include "cds/filemap.hpp"
+#include "cds/heapShared.inline.hpp"
+#include "cds/metaspaceShared.hpp"
 #include "classfile/classLoaderDataGraph.hpp"
 #include "classfile/javaClasses.inline.hpp"
 #include "classfile/modules.hpp"
@@ -43,12 +47,9 @@
 #include "gc/shared/genCollectedHeap.hpp"
 #include "jvmtifiles/jvmtiEnv.hpp"
 #include "logging/log.hpp"
-#include "memory/filemap.hpp"
-#include "memory/heapShared.inline.hpp"
 #include "memory/iterator.hpp"
 #include "memory/metadataFactory.hpp"
 #include "memory/metaspace/testHelpers.hpp"
-#include "memory/metaspaceShared.hpp"
 #include "memory/metaspaceUtils.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
@@ -92,9 +93,6 @@
 #include "utilities/exceptions.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/ostream.hpp"
-#if INCLUDE_CDS
-#include "prims/cdsoffsets.hpp"
-#endif // INCLUDE_CDS
 #if INCLUDE_G1GC
 #include "gc/g1/g1Arguments.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"

src/hotspot/share/runtime/arguments.cpp

@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "jvm.h"
+#include "cds/filemap.hpp"
 #include "classfile/classLoader.hpp"
 #include "classfile/javaAssertions.hpp"
 #include "classfile/moduleEntry.hpp"
@@ -38,7 +39,6 @@
 #include "logging/logStream.hpp"
 #include "logging/logTag.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/filemap.hpp"
 #include "oops/oop.inline.hpp"
 #include "prims/jvmtiExport.hpp"
 #include "runtime/arguments.hpp"

src/hotspot/share/runtime/java.cpp

@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "jvm.h"
 #include "aot/aotLoader.hpp"
+#include "cds/dynamicArchive.hpp"
 #include "classfile/classLoaderDataGraph.hpp"
 #include "classfile/javaClasses.hpp"
 #include "classfile/stringTable.hpp"
@@ -45,7 +46,6 @@
 #include "memory/metaspaceUtils.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/dynamicArchive.hpp"
 #include "memory/universe.hpp"
 #include "oops/constantPool.hpp"
 #include "oops/generateOopMap.hpp"

src/hotspot/share/runtime/thread.cpp

@@ -26,6 +26,7 @@
 #include "precompiled.hpp"
 #include "jvm.h"
 #include "aot/aotLoader.hpp"
+#include "cds/metaspaceShared.hpp"
 #include "classfile/classLoader.hpp"
 #include "classfile/javaClasses.hpp"
 #include "classfile/javaThreadStatus.hpp"
@@ -55,7 +56,6 @@
 #include "logging/logStream.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/iterator.hpp"
-#include "memory/metaspaceShared.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"

src/hotspot/share/runtime/vmStructs.cpp

@@ -23,12 +23,12 @@
  */
 
 #include "precompiled.hpp"
+#include "cds/filemap.hpp"
 #include "ci/ciField.hpp"
 #include "ci/ciInstance.hpp"
 #include "ci/ciMethodData.hpp"
 #include "ci/ciObjArrayKlass.hpp"
 #include "ci/ciSymbol.hpp"
-#include "classfile/compactHashtable.hpp"
 #include "classfile/classLoaderDataGraph.hpp"
 #include "classfile/dictionary.hpp"
 #include "classfile/javaClasses.hpp"
@@ -58,7 +58,6 @@
 #include "memory/referenceType.hpp"
 #include "memory/universe.hpp"
 #include "memory/virtualspace.hpp"
-#include "memory/filemap.hpp"
 #include "oops/array.hpp"
 #include "oops/arrayKlass.hpp"
 #include "oops/arrayOop.hpp"

src/hotspot/share/utilities/ostream.cpp

@@ -24,7 +24,7 @@
 
 #include "precompiled.hpp"
 #include "jvm.h"
-#include "classfile/classListWriter.hpp"
+#include "cds/classListWriter.hpp"
 #include "compiler/compileLog.hpp"
 #include "memory/allocation.inline.hpp"
 #include "oops/oop.inline.hpp"

src/hotspot/share/utilities/vmError.cpp

@@ -25,6 +25,7 @@
 
 #include "precompiled.hpp"
 #include "jvm.h"
+#include "cds/metaspaceShared.hpp"
 #include "code/codeCache.hpp"
 #include "compiler/compileBroker.hpp"
 #include "compiler/disassembler.hpp"
@@ -32,7 +33,6 @@
 #include "gc/shared/gcLogPrecious.hpp"
 #include "logging/logConfiguration.hpp"
 #include "memory/metaspace.hpp"
-#include "memory/metaspaceShared.hpp"
 #include "memory/metaspaceUtils.hpp"
 #include "memory/resourceArea.inline.hpp"
 #include "memory/universe.hpp"