8365264: Rename ResourceHashtable to HashTable

src/hotspot/share/cds/aotClassLinker.hpp

@@ -26,13 +26,13 @@
 #define SHARE_CDS_AOTCLASSLINKER_HPP
 
 #include "interpreter/bytecodes.hpp"
-#include "memory/allocation.hpp"
 #include "memory/allStatic.hpp"
+#include "memory/allocation.hpp"
 #include "oops/oopsHierarchy.hpp"
 #include "utilities/exceptions.hpp"
 #include "utilities/growableArray.hpp"
-#include "utilities/macros.hpp"
 #include "utilities/hashtable.hpp"
+#include "utilities/macros.hpp"
 
 class AOTLinkedClassTable;
 class InstanceKlass;

src/hotspot/share/cds/aotConstantPoolResolver.hpp

@@ -26,13 +26,13 @@
 #define SHARE_CDS_AOTCONSTANTPOOLRESOLVER_HPP
 
 #include "interpreter/bytecodes.hpp"
-#include "memory/allocation.hpp"
 #include "memory/allStatic.hpp"
+#include "memory/allocation.hpp"
 #include "oops/oopsHierarchy.hpp"
 #include "runtime/handles.hpp"
 #include "utilities/exceptions.hpp"
-#include "utilities/macros.hpp"
 #include "utilities/hashtable.hpp"
+#include "utilities/macros.hpp"
 
 class ConstantPool;
 class constantPoolHandle;

src/hotspot/share/cds/archiveBuilder.hpp

@@ -36,8 +36,8 @@
 #include "runtime/os.hpp"
 #include "utilities/bitMap.hpp"
 #include "utilities/growableArray.hpp"
-#include "utilities/resizeableResourceHash.hpp"
 #include "utilities/hashtable.hpp"
+#include "utilities/resizeableResourceHash.hpp"
 
 class ArchiveHeapInfo;
 class CHeapBitMap;

src/hotspot/share/cds/archiveHeapWriter.hpp

@@ -26,14 +26,14 @@
 #define SHARE_CDS_ARCHIVEHEAPWRITER_HPP
 
 #include "cds/heapShared.hpp"
-#include "memory/allocation.hpp"
 #include "memory/allStatic.hpp"
+#include "memory/allocation.hpp"
 #include "oops/oopHandle.hpp"
 #include "utilities/bitMap.hpp"
 #include "utilities/exceptions.hpp"
 #include "utilities/growableArray.hpp"
-#include "utilities/macros.hpp"
 #include "utilities/hashtable.hpp"
+#include "utilities/macros.hpp"
 
 class MemRegion;
 

src/hotspot/share/cds/heapShared.hpp

@@ -30,8 +30,8 @@
 #include "classfile/compactHashtable.hpp"
 #include "classfile/javaClasses.hpp"
 #include "gc/shared/gc_globals.hpp"
-#include "memory/allocation.hpp"
 #include "memory/allStatic.hpp"
+#include "memory/allocation.hpp"
 #include "oops/compressedOops.hpp"
 #include "oops/oop.hpp"
 #include "oops/oopHandle.hpp"

src/hotspot/share/cds/metaspaceShared.cpp

@@ -22,6 +22,7 @@
  *
  */
 
+#include "cds/metaspaceShared.hpp"
 #include "cds/aotArtifactFinder.hpp"
 #include "cds/aotClassInitializer.hpp"
 #include "cds/aotClassLinker.hpp"
@@ -33,9 +34,9 @@
 #include "cds/archiveBuilder.hpp"
 #include "cds/archiveHeapLoader.hpp"
 #include "cds/archiveHeapWriter.hpp"
-#include "cds/cds_globals.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/cdsProtectionDomain.hpp"
+#include "cds/cds_globals.hpp"
 #include "cds/classListParser.hpp"
 #include "cds/classListWriter.hpp"
 #include "cds/cppVtables.hpp"
@@ -46,7 +47,6 @@
 #include "cds/heapShared.hpp"
 #include "cds/lambdaFormInvokers.hpp"
 #include "cds/lambdaProxyClassDictionary.hpp"
-#include "cds/metaspaceShared.hpp"
 #include "classfile/classLoaderDataGraph.hpp"
 #include "classfile/classLoaderDataShared.hpp"
 #include "classfile/javaClasses.inline.hpp"
@@ -62,8 +62,8 @@
 #include "code/aotCodeCache.hpp"
 #include "code/codeCache.hpp"
 #include "gc/shared/gcVMOperations.hpp"
-#include "interpreter/bytecodes.hpp"
 #include "interpreter/bytecodeStream.hpp"
+#include "interpreter/bytecodes.hpp"
 #include "jvm_io.h"
 #include "logging/log.hpp"
 #include "logging/logMessage.hpp"
@@ -97,9 +97,9 @@
 #include "utilities/align.hpp"
 #include "utilities/bitMap.inline.hpp"
 #include "utilities/defaultStream.hpp"
+#include "utilities/hashtable.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/ostream.hpp"
-#include "utilities/hashtable.hpp"
 
 #include <sys/stat.h>
 

src/hotspot/share/cds/regeneratedClasses.cpp

@@ -22,8 +22,8 @@
  *
  */
 
-#include "cds/archiveBuilder.hpp"
 #include "cds/regeneratedClasses.hpp"
+#include "cds/archiveBuilder.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "memory/universe.hpp"
 #include "oops/instanceKlass.hpp"

src/hotspot/share/classfile/bytecodeAssembler.hpp

@@ -32,7 +32,6 @@
 #include "utilities/growableArray.hpp"
 #include "utilities/hashtable.hpp"
 
-
 /**
  * Bytecode Assembler
  *

src/hotspot/share/classfile/classFileParser.cpp

@@ -21,12 +21,12 @@
  * questions.
  *
  */
-#include "cds/cdsConfig.hpp"
 #include "classfile/classFileParser.hpp"
+#include "cds/cdsConfig.hpp"
 #include "classfile/classFileStream.hpp"
+#include "classfile/classLoadInfo.hpp"
 #include "classfile/classLoader.hpp"
 #include "classfile/classLoaderData.inline.hpp"
-#include "classfile/classLoadInfo.hpp"
 #include "classfile/defaultMethods.hpp"
 #include "classfile/fieldLayoutBuilder.hpp"
 #include "classfile/javaClasses.inline.hpp"
@@ -81,9 +81,9 @@
 #include "utilities/formatBuffer.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/growableArray.hpp"
+#include "utilities/hashtable.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/ostream.hpp"
-#include "utilities/hashtable.hpp"
 #include "utilities/utf8.hpp"
 #if INCLUDE_CDS
 #include "classfile/systemDictionaryShared.hpp"

src/hotspot/share/classfile/classLoaderStats.hpp

@@ -25,7 +25,6 @@
 #ifndef SHARE_CLASSFILE_CLASSLOADERSTATS_HPP
 #define SHARE_CLASSFILE_CLASSLOADERSTATS_HPP
 
-
 #include "classfile/classLoaderData.hpp"
 #include "oops/klass.hpp"
 #include "oops/oop.hpp"
@@ -34,7 +33,6 @@
 #include "services/diagnosticCommand.hpp"
 #include "utilities/hashtable.hpp"
 
-
 class ClassLoaderStatsDCmd : public DCmd {
 public:
   ClassLoaderStatsDCmd(outputStream* output, bool heap) :

src/hotspot/share/classfile/loaderConstraints.cpp

@@ -22,10 +22,10 @@
  *
  */
 
+#include "classfile/loaderConstraints.hpp"
 #include "classfile/classLoaderData.inline.hpp"
 #include "classfile/classLoaderDataGraph.hpp"
 #include "classfile/dictionary.hpp"
-#include "classfile/loaderConstraints.hpp"
 #include "logging/log.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/klass.inline.hpp"

src/hotspot/share/classfile/moduleEntry.cpp

@@ -22,6 +22,7 @@
  *
  */
 
+#include "classfile/moduleEntry.hpp"
 #include "cds/aotClassLocation.hpp"
 #include "cds/archiveBuilder.hpp"
 #include "cds/archiveUtils.hpp"
@@ -31,7 +32,6 @@
 #include "classfile/classLoaderData.inline.hpp"
 #include "classfile/classLoaderDataShared.hpp"
 #include "classfile/javaClasses.inline.hpp"
-#include "classfile/moduleEntry.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "classfile/systemDictionaryShared.hpp"
 #include "jni.h"
@@ -45,9 +45,9 @@
 #include "runtime/safepoint.hpp"
 #include "utilities/events.hpp"
 #include "utilities/growableArray.hpp"
+#include "utilities/hashtable.hpp"
 #include "utilities/ostream.hpp"
 #include "utilities/quickSort.hpp"
-#include "utilities/hashtable.hpp"
 
 ModuleEntry* ModuleEntryTable::_javabase_module = nullptr;
 

src/hotspot/share/classfile/moduleEntry.hpp

@@ -31,9 +31,9 @@
 #include "oops/symbolHandle.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "utilities/growableArray.hpp"
+#include "utilities/hashtable.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/ostream.hpp"
-#include "utilities/hashtable.hpp"
 #if INCLUDE_JFR
 #include "jfr/support/jfrTraceIdExtension.hpp"
 #endif

src/hotspot/share/classfile/packageEntry.cpp

@@ -22,12 +22,12 @@
  *
  */
 
+#include "classfile/packageEntry.hpp"
 #include "cds/archiveBuilder.hpp"
 #include "cds/archiveUtils.hpp"
 #include "cds/cdsConfig.hpp"
 #include "classfile/classLoaderData.hpp"
 #include "classfile/moduleEntry.hpp"
-#include "classfile/packageEntry.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
@@ -38,9 +38,9 @@
 #include "runtime/java.hpp"
 #include "utilities/events.hpp"
 #include "utilities/growableArray.hpp"
+#include "utilities/hashtable.hpp"
 #include "utilities/ostream.hpp"
 #include "utilities/quickSort.hpp"
-#include "utilities/hashtable.hpp"
 
 PackageEntry::PackageEntry(Symbol* name, ModuleEntry* module) :
   _name(name),

src/hotspot/share/classfile/packageEntry.hpp

@@ -30,9 +30,9 @@
 #include "oops/symbolHandle.hpp"
 #include "runtime/atomic.hpp"
 #include "utilities/growableArray.hpp"
+#include "utilities/hashtable.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/ostream.hpp"
-#include "utilities/hashtable.hpp"
 #if INCLUDE_JFR
 #include "jfr/support/jfrTraceIdExtension.hpp"
 #endif

src/hotspot/share/classfile/placeholders.cpp

@@ -22,8 +22,8 @@
  *
  */
 
-#include "classfile/classLoaderData.inline.hpp"
 #include "classfile/placeholders.hpp"
+#include "classfile/classLoaderData.inline.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "logging/logTag.hpp"

src/hotspot/share/classfile/systemDictionaryShared.cpp

@@ -22,6 +22,7 @@
  *
  */
 
+#include "classfile/systemDictionaryShared.hpp"
 #include "cds/aotClassFilter.hpp"
 #include "cds/aotClassLocation.hpp"
 #include "cds/aotLogging.hpp"
@@ -48,7 +49,6 @@
 #include "classfile/javaClasses.inline.hpp"
 #include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionary.hpp"
-#include "classfile/systemDictionaryShared.hpp"
 #include "classfile/verificationType.hpp"
 #include "classfile/vmClasses.hpp"
 #include "classfile/vmSymbols.hpp"

src/hotspot/share/code/nmethod.cpp

@@ -33,9 +33,9 @@
 #include "compiler/compilationLog.hpp"
 #include "compiler/compileBroker.hpp"
 #include "compiler/compileLog.hpp"
+#include "compiler/compileTask.hpp"
 #include "compiler/compilerDirectives.hpp"
 #include "compiler/compilerOracle.hpp"
-#include "compiler/compileTask.hpp"
 #include "compiler/directivesParser.hpp"
 #include "compiler/disassembler.hpp"
 #include "compiler/oopMap.inline.hpp"

src/hotspot/share/compiler/disassembler.cpp

@@ -22,12 +22,12 @@
  *
  */
 
+#include "compiler/disassembler.hpp"
 #include "asm/assembler.inline.hpp"
 #include "asm/macroAssembler.hpp"
 #include "ci/ciUtilities.hpp"
 #include "classfile/javaClasses.hpp"
 #include "code/codeCache.hpp"
-#include "compiler/disassembler.hpp"
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/cardTableBarrierSet.hpp"
 #include "gc/shared/collectedHeap.hpp"

src/hotspot/share/gc/z/zVerify.cpp

@@ -21,6 +21,7 @@
  * questions.
  */
 
+#include "gc/z/zVerify.hpp"
 #include "classfile/classLoaderData.hpp"
 #include "gc/shared/gc_globals.hpp"
 #include "gc/shared/isGCActiveMark.hpp"
@@ -34,7 +35,6 @@
 #include "gc/z/zStackWatermark.hpp"
 #include "gc/z/zStat.hpp"
 #include "gc/z/zStoreBarrierBuffer.inline.hpp"
-#include "gc/z/zVerify.hpp"
 #include "memory/allocation.hpp"
 #include "memory/iterator.inline.hpp"
 #include "memory/resourceArea.hpp"
@@ -51,8 +51,8 @@
 #include "runtime/thread.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
-#include "utilities/preserveException.hpp"
 #include "utilities/hashtable.hpp"
+#include "utilities/preserveException.hpp"
 #include "utilities/vmError.hpp"
 
 #ifdef ASSERT

src/hotspot/share/logging/logAsyncWriter.hpp

@@ -29,8 +29,8 @@
 #include "logging/logMessageBuffer.hpp"
 #include "memory/allocation.hpp"
 #include "runtime/mutex.hpp"
-#include "runtime/os.inline.hpp"
 #include "runtime/nonJavaThread.hpp"
+#include "runtime/os.inline.hpp"
 #include "runtime/semaphore.hpp"
 #include "utilities/hashtable.hpp"
 

src/hotspot/share/oops/constantPool.hpp

@@ -37,8 +37,8 @@
 #include "utilities/align.hpp"
 #include "utilities/bytes.hpp"
 #include "utilities/constantTag.hpp"
-#include "utilities/macros.hpp"
 #include "utilities/hashtable.hpp"
+#include "utilities/macros.hpp"
 
 // A ConstantPool is an array containing class constants as described in the
 // class file.

src/hotspot/share/opto/compile.cpp

@@ -22,6 +22,7 @@
  *
  */
 
+#include "opto/compile.hpp"
 #include "asm/macroAssembler.hpp"
 #include "asm/macroAssembler.inline.hpp"
 #include "ci/ciReplay.hpp"
@@ -33,9 +34,9 @@
 #include "compiler/compilationMemoryStatistic.hpp"
 #include "compiler/compileBroker.hpp"
 #include "compiler/compileLog.hpp"
-#include "compiler/compiler_globals.hpp"
 #include "compiler/compilerDefinitions.hpp"
 #include "compiler/compilerOracle.hpp"
+#include "compiler/compiler_globals.hpp"
 #include "compiler/disassembler.hpp"
 #include "compiler/oopMap.hpp"
 #include "gc/shared/barrierSet.hpp"
@@ -53,7 +54,6 @@
 #include "opto/castnode.hpp"
 #include "opto/cfgnode.hpp"
 #include "opto/chaitin.hpp"
-#include "opto/compile.hpp"
 #include "opto/connode.hpp"
 #include "opto/convertnode.hpp"
 #include "opto/divnode.hpp"
@@ -87,8 +87,8 @@
 #include "runtime/timer.hpp"
 #include "utilities/align.hpp"
 #include "utilities/copy.hpp"
-#include "utilities/macros.hpp"
 #include "utilities/hashtable.hpp"
+#include "utilities/macros.hpp"
 
 // -------------------- Compile::mach_constant_base_node -----------------------
 // Constant table base node singleton.