DRAFT!!! Remove unneeded includes

src/hotspot/share/runtime/abstract_vm_version.cpp

@@ -23,12 +23,12 @@
  */
 
 #include "cds/cdsConfig.hpp"
-#include "compiler/compilerDefinitions.hpp"
-#include "jvm_io.h"
+//NONEED #include "compiler/compilerDefinitions.hpp"
+//NONEED #include "jvm_io.h"
 #include "runtime/arguments.hpp"
 #include "runtime/os.hpp"
-#include "runtime/vm_version.hpp"
-#include "utilities/globalDefinitions.hpp"
+//NONEED #include "runtime/vm_version.hpp"
+//NONEED #include "utilities/globalDefinitions.hpp"
 
 const char* Abstract_VM_Version::_s_vm_release = Abstract_VM_Version::vm_release();
 const char* Abstract_VM_Version::_s_internal_vm_info_string = Abstract_VM_Version::internal_vm_info_string();

src/hotspot/share/runtime/arguments.cpp

@@ -28,40 +28,40 @@
 #include "classfile/classLoader.hpp"
 #include "classfile/javaAssertions.hpp"
 #include "classfile/moduleEntry.hpp"
-#include "classfile/stringTable.hpp"
-#include "classfile/symbolTable.hpp"
+//#include "classfile/stringTable.hpp"
+//#include "classfile/symbolTable.hpp"
 #include "compiler/compilerDefinitions.hpp"
-#include "cppstdlib/limits.hpp"
+//#include "cppstdlib/limits.hpp"
 #include "gc/shared/gc_globals.hpp"
 #include "gc/shared/gcArguments.hpp"
 #include "gc/shared/gcConfig.hpp"
 #include "gc/shared/stringdedup/stringDedup.hpp"
-#include "gc/shared/tlab_globals.hpp"
-#include "jvm.h"
+//NONEED #include "gc/shared/tlab_globals.hpp"
+//NONEED #include "jvm.h"
 #include "logging/log.hpp"
 #include "logging/logConfiguration.hpp"
 #include "logging/logStream.hpp"
 #include "logging/logTag.hpp"
-#include "memory/allocation.inline.hpp"
+//#include "memory/allocation.inline.hpp"
 #include "nmt/nmtCommon.hpp"
 #include "oops/compressedKlass.hpp"
 #include "oops/instanceKlass.hpp"
-#include "oops/objLayout.hpp"
-#include "oops/oop.inline.hpp"
+//#include "oops/objLayout.hpp"
+//#include "oops/oop.inline.hpp"
 #include "prims/jvmtiAgentList.hpp"
-#include "prims/jvmtiExport.hpp"
+//NONEED #include "prims/jvmtiExport.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/flags/jvmFlag.hpp"
 #include "runtime/flags/jvmFlagAccess.hpp"
 #include "runtime/flags/jvmFlagLimit.hpp"
 #include "runtime/globals_extension.hpp"
 #include "runtime/java.hpp"
 #include "runtime/os.hpp"
-#include "runtime/safepoint.hpp"
-#include "runtime/safepointMechanism.hpp"
+//NONEED #include "runtime/safepoint.hpp"
+//NONEED #include "runtime/safepointMechanism.hpp"
 #include "runtime/synchronizer.hpp"
-#include "runtime/vm_version.hpp"
-#include "services/management.hpp"
+//NONEED #include "runtime/vm_version.hpp"
+//NONEED #include "services/management.hpp"
 #include "utilities/align.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/defaultStream.hpp"

src/hotspot/share/runtime/continuation.cpp

@@ -24,20 +24,20 @@
 
 #include "classfile/vmSymbols.hpp"
 #include "gc/shared/barrierSetNMethod.hpp"
-#include "oops/method.inline.hpp"
-#include "oops/oop.inline.hpp"
+/*NEED*/#include "oops/method.inline.hpp"
+//NONEED #include "oops/oop.inline.hpp"
 #include "prims/jvmtiThreadState.inline.hpp"
 #include "runtime/continuation.hpp"
-#include "runtime/continuationEntry.inline.hpp"
+//NONEED #include "runtime/continuationEntry.inline.hpp"
 #include "runtime/continuationHelper.inline.hpp"
-#include "runtime/continuationJavaClasses.inline.hpp"
+//NONEED #include "runtime/continuationJavaClasses.inline.hpp"
 #include "runtime/continuationWrapper.inline.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
-#include "runtime/javaThread.inline.hpp"
-#include "runtime/jniHandles.inline.hpp"
+//NONEED #include "runtime/javaThread.inline.hpp"
+//NONEED #include "runtime/jniHandles.inline.hpp"
 #include "runtime/mountUnmountDisabler.hpp"
 #include "runtime/osThread.hpp"
-#include "runtime/vframe.inline.hpp"
+//NONEED #include "runtime/vframe.inline.hpp"
 #include "runtime/vframe_hp.hpp"
 
 // defined in continuationFreezeThaw.cpp

src/hotspot/share/runtime/continuationWrapper.cpp

@@ -22,11 +22,11 @@
  *
  */
 
-#include "classfile/javaClasses.inline.hpp"
-#include "jfr/jfrEvents.hpp"
-#include "jfr/support/jfrThreadId.hpp"
-#include "logging/log.hpp"
-#include "logging/logStream.hpp"
+//NONEED #include "classfile/javaClasses.inline.hpp"
+//NONEED #include "jfr/jfrEvents.hpp"
+//NONEED #include "jfr/support/jfrThreadId.hpp"
+//NONEED #include "logging/log.hpp"
+//NONEED #include "logging/logStream.hpp"
 #include "oops/oopsHierarchy.hpp"
 #include "oops/stackChunkOop.inline.hpp"
 #include "runtime/continuation.hpp"

src/hotspot/share/runtime/escapeBarrier.cpp

@@ -23,26 +23,26 @@
  *
  */
 
-#include "code/scopeDesc.hpp"
+//NONEED #include "code/scopeDesc.hpp"
 #include "memory/allocation.hpp"
 #include "prims/jvmtiDeferredUpdates.hpp"
 #include "runtime/deoptimization.hpp"
 #include "runtime/escapeBarrier.hpp"
-#include "runtime/frame.inline.hpp"
+//NONEED #include "runtime/frame.inline.hpp"
 #include "runtime/handles.hpp"
 #include "runtime/handshake.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
-#include "runtime/javaThread.inline.hpp"
+//NONEED #include "runtime/javaThread.inline.hpp"
 #include "runtime/keepStackGCProcessed.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/registerMap.hpp"
 #include "runtime/stackFrameStream.inline.hpp"
 #include "runtime/stackValue.hpp"
-#include "runtime/stackValueCollection.hpp"
+//NONEED #include "runtime/stackValueCollection.hpp"
 #include "runtime/threadSMR.hpp"
 #include "runtime/vframe.hpp"
 #include "runtime/vframe_hp.hpp"
-#include "utilities/debug.hpp"
+//NONEED #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
 

src/hotspot/share/runtime/fieldDescriptor.cpp

@@ -22,17 +22,17 @@
  *
  */
 
-#include "classfile/vmSymbols.hpp"
-#include "memory/resourceArea.hpp"
+//NONEED #include "classfile/vmSymbols.hpp"
+//NONEED #include "memory/resourceArea.hpp"
 #include "oops/annotations.hpp"
 #include "oops/constantPool.hpp"
-#include "oops/fieldStreams.inline.hpp"
+//NONEED #include "oops/fieldStreams.inline.hpp"
 #include "oops/instanceKlass.hpp"
-#include "oops/klass.inline.hpp"
+//NONEED #include "oops/klass.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/fieldDescriptor.inline.hpp"
-#include "runtime/handles.inline.hpp"
-#include "runtime/signature.hpp"
+//NONEED #include "runtime/handles.inline.hpp"
+//NONEED #include "runtime/signature.hpp"
 
 Symbol* fieldDescriptor::generic_signature() const {
   if (!has_generic_signature()) {

src/hotspot/share/runtime/flags/jvmFlag.cpp

@@ -22,9 +22,9 @@
  *
  */
 
-#include "jfr/jfrEvents.hpp"
+//NONEED #include "jfr/jfrEvents.hpp"
 #include "jvm_io.h"
-#include "memory/allocation.inline.hpp"
+//NONEED #include "memory/allocation.inline.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/flags/jvmFlag.hpp"
 #include "runtime/flags/jvmFlagAccess.hpp"

src/hotspot/share/runtime/flags/jvmFlagLimit.cpp

@@ -23,15 +23,15 @@
  */
 
 #include "gc/shared/jvmFlagConstraintsGC.hpp"
-#include "memory/allocation.inline.hpp"
+//NONEED #include "memory/allocation.inline.hpp"
 #include "oops/markWord.hpp"
 #include "runtime/flags/jvmFlag.hpp"
 #include "runtime/flags/jvmFlagAccess.hpp"
 #include "runtime/flags/jvmFlagConstraintsCompiler.hpp"
 #include "runtime/flags/jvmFlagConstraintsRuntime.hpp"
 #include "runtime/flags/jvmFlagLimit.hpp"
 #include "runtime/globals_extension.hpp"
-#include "runtime/task.hpp"
+//NONEED #include "runtime/task.hpp"
 #include "utilities/vmError.hpp"
 
 //----------------------------------------------------------------------

src/hotspot/share/runtime/handles.cpp

@@ -22,11 +22,11 @@
  *
  */
 
-#include "memory/allocation.inline.hpp"
+//NONEED #include "memory/allocation.inline.hpp"
 #include "oops/constantPool.hpp"
 #include "oops/method.hpp"
-#include "oops/oop.inline.hpp"
-#include "runtime/handles.inline.hpp"
+//NONEED #include "oops/oop.inline.hpp"
+//NONEED #include "runtime/handles.inline.hpp"
 #include "runtime/javaThread.hpp"
 
 #ifdef ASSERT

src/hotspot/share/runtime/init.cpp

@@ -25,27 +25,27 @@
 #include "classfile/stringTable.hpp"
 #include "classfile/symbolTable.hpp"
 #include "code/aotCodeCache.hpp"
-#include "compiler/compiler_globals.hpp"
-#include "gc/shared/collectedHeap.hpp"
-#include "gc/shared/gcHeapSummary.hpp"
-#include "interpreter/bytecodes.hpp"
+//NONEED #include "compiler/compiler_globals.hpp"
+//NONEED #include "gc/shared/collectedHeap.hpp"
+//NONEED #include "gc/shared/gcHeapSummary.hpp"
+//NONEED #include "interpreter/bytecodes.hpp"
 #include "logging/logAsyncWriter.hpp"
 #include "memory/universe.hpp"
-#include "nmt/memTracker.hpp"
+//NONEED #include "nmt/memTracker.hpp"
 #include "oops/trainingData.hpp"
-#include "prims/downcallLinker.hpp"
+//NONEED #include "prims/downcallLinker.hpp"
 #include "prims/jvmtiExport.hpp"
 #include "prims/methodHandles.hpp"
 #include "runtime/atomicAccess.hpp"
 #include "runtime/continuation.hpp"
 #include "runtime/flags/jvmFlag.hpp"
 #include "runtime/globals.hpp"
-#include "runtime/handles.inline.hpp"
-#include "runtime/icache.hpp"
+//NONEED #include "runtime/handles.inline.hpp"
+//NONEED #include "runtime/icache.hpp"
 #include "runtime/init.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/sharedRuntime.hpp"
-#include "sanitizers/leak.hpp"
+//NONEED #include "sanitizers/leak.hpp"
 #include "utilities/macros.hpp"
 
 // Initialization done by VM thread in vm_init_globals()

src/hotspot/share/runtime/java.cpp

@@ -40,56 +40,56 @@
 #include "compiler/compileBroker.hpp"
 #include "compiler/compilerOracle.hpp"
 #include "gc/shared/collectedHeap.hpp"
-#include "gc/shared/stringdedup/stringDedup.hpp"
+//NONEED #include "gc/shared/stringdedup/stringDedup.hpp"
 #include "interpreter/bytecodeHistogram.hpp"
 #include "jfr/jfrEvents.hpp"
 #include "jfr/support/jfrThreadId.hpp"
-#include "jvm.h"
+//NONEED #include "jvm.h"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/metaspaceUtils.hpp"
-#include "memory/oopFactory.hpp"
+//NONEED #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "nmt/memMapPrinter.hpp"
 #include "nmt/memTracker.hpp"
 #include "oops/constantPool.hpp"
 #include "oops/generateOopMap.hpp"
 #include "oops/instanceKlass.hpp"
-#include "oops/instanceOop.hpp"
-#include "oops/klassVtable.hpp"
-#include "oops/method.inline.hpp"
-#include "oops/objArrayOop.hpp"
-#include "oops/oop.inline.hpp"
+//NONEED #include "oops/instanceOop.hpp"
+//NONEED #include "oops/klassVtable.hpp"
+/*NEED*/ #include "oops/method.inline.hpp"
+//NONEED #include "oops/objArrayOop.hpp"
+//NONEED #include "oops/oop.inline.hpp"
 #include "oops/symbol.hpp"
 #include "prims/jvmtiAgentList.hpp"
 #include "prims/jvmtiExport.hpp"
 #include "runtime/continuation.hpp"
 #include "runtime/deoptimization.hpp"
 #include "runtime/flags/flagSetting.hpp"
-#include "runtime/handles.inline.hpp"
+//NONEED #include "runtime/handles.inline.hpp"
 #include "runtime/init.hpp"
-#include "runtime/interfaceSupport.inline.hpp"
+//NONEED #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/java.hpp"
-#include "runtime/javaThread.hpp"
+/*NEED*/ #include "runtime/javaThread.inline.hpp"
 #include "runtime/os.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"
-#include "runtime/task.hpp"
+//NONEED #include "runtime/task.hpp"
 #include "runtime/threads.hpp"
-#include "runtime/timer.hpp"
+//NONEED #include "runtime/timer.hpp"
 #include "runtime/trimNativeHeap.hpp"
-#include "runtime/vm_version.hpp"
+//NONEED #include "runtime/vm_version.hpp"
 #include "runtime/vmOperations.hpp"
 #include "runtime/vmThread.hpp"
-#include "sanitizers/leak.hpp"
+//NONEED #include "sanitizers/leak.hpp"
 #include "utilities/dtrace.hpp"
 #include "utilities/events.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/vmError.hpp"
 #ifdef COMPILER1
-#include "c1/c1_Compiler.hpp"
+//NONEED #include "c1/c1_Compiler.hpp"
 #include "c1/c1_Runtime1.hpp"
 #endif
 #ifdef COMPILER2

src/hotspot/share/runtime/javaCalls.cpp

@@ -24,27 +24,27 @@
  */
 
 #include "classfile/vmSymbols.hpp"
-#include "code/nmethod.hpp"
+//NONEED #include "code/nmethod.hpp"
 #include "compiler/compilationPolicy.hpp"
-#include "compiler/compileBroker.hpp"
-#include "interpreter/interpreter.hpp"
+//NONEED #include "compiler/compileBroker.hpp"
+//NONEED #include "interpreter/interpreter.hpp"
 #include "interpreter/linkResolver.hpp"
-#include "memory/universe.hpp"
-#include "oops/method.inline.hpp"
-#include "oops/oop.inline.hpp"
-#include "prims/jniCheck.hpp"
+//NONEED #include "memory/universe.hpp"
+/*NEED*/#include "oops/method.inline.hpp"
+//NONEED #include "oops/oop.inline.hpp"
+//NONEED #include "prims/jniCheck.hpp"
 #include "prims/jvmtiExport.hpp"
-#include "runtime/handles.inline.hpp"
+//NONEED #include "runtime/handles.inline.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/javaCalls.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/jniHandles.inline.hpp"
-#include "runtime/mutexLocker.hpp"
+//NONEED #include "runtime/mutexLocker.hpp"
 #include "runtime/os.inline.hpp"
-#include "runtime/sharedRuntime.hpp"
+//NONEED #include "runtime/sharedRuntime.hpp"
 #include "runtime/signature.hpp"
 #include "runtime/stubRoutines.hpp"
-#include "runtime/thread.inline.hpp"
+//NONEED #include "runtime/thread.inline.hpp"
 
 // -----------------------------------------------------
 // Implementation of JavaCallWrapper