Skip to content

DRAFT!!! Remove unneeded includes from runtime .inline.hpp files #32036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
iklam wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

DRAFT!!! Remove unneeded includes from runtime .inline.hpp files #32036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
65df7ef
step1
iklam Jul 24, 2026
6714c0b
step2
iklam Jul 24, 2026
0e57500
step3
iklam Jul 24, 2026
e80b66a
fixes
iklam Jul 24, 2026
196351a
more fixes
iklam Jul 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/hotspot/share/cds/aotArtifactFinder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#include "classfile/vmClasses.hpp"
#include "logging/log.hpp"
#include "memory/metaspaceClosure.hpp"
#include "memory/resourceArea.hpp"
#include "oops/instanceKlass.hpp"
#include "oops/objArrayKlass.hpp"
#include "oops/trainingData.hpp"
Expand Down
1 change: 1 addition & 0 deletions src/hotspot/share/cds/aotClassInitializer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include "classfile/symbolTable.hpp"
#include "classfile/systemDictionaryShared.hpp"
#include "classfile/vmSymbols.hpp"
#include "memory/resourceArea.hpp"
#include "oops/instanceKlass.inline.hpp"
#include "oops/symbol.hpp"
#include "runtime/java.hpp"
Expand Down
1 change: 1 addition & 0 deletions src/hotspot/share/cds/aotLinkedClassBulkLoader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
#include "runtime/handles.inline.hpp"
#include "runtime/java.hpp"
#include "runtime/serviceThread.hpp"
#include "runtime/vmThread.hpp"
#include "utilities/growableArray.hpp"

void AOTLinkedClassBulkLoader::serialize(SerializeClosure* soc) {
Expand Down
1 change: 1 addition & 0 deletions src/hotspot/share/cds/aotMappedHeapWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
#include "memory/allocation.inline.hpp"
#include "memory/iterator.inline.hpp"
#include "memory/oopFactory.hpp"
#include "memory/resourceArea.hpp"
#include "memory/universe.hpp"
#include "oops/compressedOops.hpp"
#include "oops/objArrayOop.inline.hpp"
Expand Down
1 change: 1 addition & 0 deletions src/hotspot/share/cds/aotOopChecker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include "classfile/javaClasses.hpp"
#include "classfile/symbolTable.hpp"
#include "classfile/vmClasses.hpp"
#include "memory/resourceArea.hpp"
#include "oops/instanceKlass.inline.hpp"
#include "runtime/fieldDescriptor.inline.hpp"
#include "utilities/debug.hpp"
Expand Down
1 change: 1 addition & 0 deletions src/hotspot/share/cds/regeneratedClasses.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include "cds/regeneratedClasses.hpp"
#include "classfile/javaClasses.hpp"
#include "classfile/vmSymbols.hpp"
#include "memory/resourceArea.hpp"
#include "memory/universe.hpp"
#include "oops/instanceKlass.hpp"
#include "oops/method.hpp"
Expand Down
1 change: 1 addition & 0 deletions src/hotspot/share/compiler/compilationPolicy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include "compiler/compileBroker.hpp"
#include "compiler/compilerDefinitions.inline.hpp"
#include "compiler/compilerOracle.hpp"
#include "interpreter/abstractInterpreter.hpp"
#include "memory/resourceArea.hpp"
#include "oops/method.inline.hpp"
#include "oops/methodData.hpp"
Expand Down
1 change: 1 addition & 0 deletions src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
#include "memory/iterator.hpp"
#include "runtime/java.hpp"
#include "runtime/mutexLocker.hpp"
#include "runtime/vmThread.hpp"
#include "utilities/debug.hpp"
#include "utilities/globalDefinitions.hpp"
#include "utilities/ticks.hpp"
Expand Down
1 change: 1 addition & 0 deletions src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
#include "gc/g1/g1YoungGCPostEvacuateTasks.hpp"
#include "gc/shared/bufferNode.hpp"
#include "gc/shared/partialArrayState.hpp"
#include "gc/shared/tlab_globals.hpp"
#include "jfr/jfrEvents.hpp"
#include "oops/access.inline.hpp"
#include "oops/compressedOops.inline.hpp"
Expand Down
1 change: 1 addition & 0 deletions src/hotspot/share/interpreter/interpreterRuntime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
#include "utilities/copy.hpp"
#include "utilities/events.hpp"
#include "utilities/exceptions.hpp"
#include "utilities/preserveException.hpp"
#if INCLUDE_JFR
#include "jfr/jfr.inline.hpp"
#endif
Expand Down
1 change: 1 addition & 0 deletions src/hotspot/share/oops/stackChunkOop.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

#include "code/nmethod.hpp"
#include "code/scopeDesc.hpp"
#include "compiler/oopMap.inline.hpp"
#include "gc/shared/barrierSet.hpp"
#include "gc/shared/barrierSetStackChunk.hpp"
#include "logging/log.hpp"
Expand Down
1 change: 1 addition & 0 deletions src/hotspot/share/prims/jniCheck.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include "logging/logTag.hpp"
#include "memory/allocation.inline.hpp"
#include "memory/guardedMemory.hpp"
#include "memory/resourceArea.hpp"
#include "oops/instanceKlass.hpp"
#include "oops/oop.inline.hpp"
#include "oops/symbol.hpp"
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/runtime/basicLock.inline.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#include "runtime/basicLock.hpp"

#include "runtime/objectMonitor.inline.hpp"
//NONEED #include "runtime/objectMonitor.inline.hpp"

inline ObjectMonitor* BasicLock::object_monitor_cache() const {
assert(UseObjectMonitorTable, "must be");
Expand Down
2 changes: 2 additions & 0 deletions src/hotspot/share/runtime/continuationHelper.inline.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@
#include "code/scopeDesc.hpp"
#include "compiler/oopMap.inline.hpp"
#include "interpreter/oopMapCache.hpp"
#include "memory/resourceArea.hpp"
#include "runtime/frame.inline.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/objectMonitor.hpp"
#include "runtime/stackValue.hpp"
#include "runtime/synchronizer.hpp"
Expand Down
6 changes: 3 additions & 3 deletions src/hotspot/share/runtime/continuationWrapper.inline.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@

// There is no continuationWrapper.hpp file

#include "classfile/javaClasses.inline.hpp"
//NONEED #include "classfile/javaClasses.inline.hpp"
#include "memory/allocation.hpp"
#include "oops/oop.inline.hpp"
//NONEED #include "oops/oop.inline.hpp"
#include "oops/oopsHierarchy.hpp"
#include "oops/stackChunkOop.hpp"
#include "runtime/continuationEntry.inline.hpp"
//NONEED #include "runtime/continuationEntry.inline.hpp"
#include "runtime/continuationJavaClasses.inline.hpp"
#include "runtime/javaThread.hpp"

Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/runtime/fieldDescriptor.inline.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include "runtime/fieldDescriptor.hpp"

#include "oops/fieldInfo.inline.hpp"
#include "runtime/handles.inline.hpp"
//NONEED #include "runtime/handles.inline.hpp"
#include "runtime/signature.hpp"

// All fieldDescriptor inline functions that (directly or indirectly) use "_cp()" or "_cp->"
Expand Down
8 changes: 4 additions & 4 deletions src/hotspot/share/runtime/frame.inline.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@

#include "runtime/frame.hpp"

#include "code/codeBlob.inline.hpp"
/*NEED*/ #include "code/codeBlob.inline.hpp"
#include "code/nmethod.inline.hpp"
#include "interpreter/interpreter.hpp"
/*NEED*/ #include "interpreter/interpreter.hpp"
#include "oops/method.hpp"
#include "oops/stackChunkOop.inline.hpp"
/*NEED*/ #include "oops/stackChunkOop.inline.hpp"
#include "runtime/continuation.hpp"
#include "runtime/registerMap.hpp"
/*NEED*/ #include "runtime/registerMap.hpp"
#include "runtime/stubRoutines.hpp"
#include "utilities/macros.hpp"
#ifdef ZERO
Expand Down
10 changes: 5 additions & 5 deletions src/hotspot/share/runtime/interfaceSupport.inline.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,18 @@

#include "gc/shared/gc_globals.hpp"
#include "runtime/globals.hpp"
#include "runtime/handles.inline.hpp"
//NONEED #include "runtime/handles.inline.hpp"
#include "runtime/javaThread.inline.hpp"
#include "runtime/mutexLocker.hpp"
#include "runtime/orderAccess.hpp"
#include "runtime/os.hpp"
#include "runtime/safepointMechanism.inline.hpp"
#include "runtime/safepointVerifiers.hpp"
#include "runtime/threadWXSetters.inline.hpp"
#include "runtime/vmOperations.hpp"
//NONEED #include "runtime/safepointVerifiers.hpp"
//NONEED #include "runtime/threadWXSetters.inline.hpp"
/*NEED*/ #include "runtime/vmOperations.hpp"
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
#include "utilities/preserveException.hpp"
/*NEED*/ #include "utilities/preserveException.hpp"

// Wrapper for all entry points to the virtual machine.

Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/runtime/javaThread.inline.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "runtime/javaThread.hpp"

#include "classfile/javaClasses.hpp"
#include "gc/shared/tlab_globals.hpp"
//NONEED #include "gc/shared/tlab_globals.hpp"
#include "memory/universe.hpp"
#include "oops/instanceKlass.hpp"
#include "oops/oopHandle.inline.hpp"
Expand Down
4 changes: 2 additions & 2 deletions src/hotspot/share/runtime/lockStack.inline.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
#include "memory/iterator.hpp"
#include "runtime/javaThread.hpp"
#include "runtime/objectMonitor.inline.hpp"
#include "runtime/safepoint.hpp"
//NONEED #include "runtime/safepoint.hpp"
#include "runtime/stackWatermark.hpp"
#include "runtime/stackWatermarkSet.inline.hpp"
//NONEED #include "runtime/stackWatermarkSet.inline.hpp"
#include "runtime/synchronizer.hpp"
#include "utilities/align.hpp"
#include "utilities/globalDefinitions.hpp"
Expand Down
4 changes: 2 additions & 2 deletions src/hotspot/share/runtime/objectMonitor.inline.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@

#include "classfile/vmSymbols.hpp"
#include "logging/log.hpp"
#include "oops/access.inline.hpp"
//NONEED #include "oops/access.inline.hpp"
#include "oops/markWord.hpp"
#include "runtime/atomicAccess.hpp"
#include "runtime/globals.hpp"
#include "runtime/javaThread.inline.hpp"
#include "runtime/lockStack.inline.hpp"
//NONEED #include "runtime/lockStack.inline.hpp"
#include "runtime/synchronizer.hpp"
#include "runtime/threadIdentifier.hpp"
#include "utilities/checkedCast.hpp"
Expand Down
1 change: 1 addition & 0 deletions src/hotspot/share/runtime/perfData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include "jvm.h"
#include "logging/log.hpp"
#include "memory/allocation.inline.hpp"
#include "memory/resourceArea.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/arguments.hpp"
#include "runtime/handles.inline.hpp"
Expand Down
4 changes: 2 additions & 2 deletions src/hotspot/share/runtime/perfData.inline.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
#include "runtime/perfData.hpp"

#include "utilities/globalCounter.inline.hpp"
#include "utilities/globalDefinitions.hpp"
#include "utilities/growableArray.hpp"
//NONEED #include "utilities/globalDefinitions.hpp"
//NONEED #include "utilities/growableArray.hpp"

inline int PerfDataList::length() {
return _set->length();
Expand Down
12 changes: 6 additions & 6 deletions src/hotspot/share/runtime/stackChunkFrameStream.inline.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@

#include "runtime/stackChunkFrameStream.hpp"

#include "code/codeCache.inline.hpp"
//NONEED #include "code/codeCache.inline.hpp"
#include "compiler/oopMap.hpp"
#include "interpreter/interpreter.hpp"
/*NEED*/ #include "interpreter/interpreter.hpp"
#include "logging/log.hpp"
#include "oops/instanceStackChunkKlass.inline.hpp"
//NONEED #include "oops/instanceStackChunkKlass.inline.hpp"
#include "oops/method.hpp"
#include "oops/oop.hpp"
#include "oops/stackChunkOop.inline.hpp"
#include "runtime/frame.inline.hpp"
//NONEED #include "oops/oop.hpp"
//NONEED #include "oops/stackChunkOop.inline.hpp"
//NONEED #include "runtime/frame.inline.hpp"
#include "utilities/debug.hpp"
#include "utilities/devirtualizer.inline.hpp"
#include "utilities/globalDefinitions.hpp"
Expand Down
1 change: 1 addition & 0 deletions src/hotspot/share/runtime/stackWatermark.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
*/

#include "logging/log.hpp"
#include "memory/resourceArea.hpp"
#include "runtime/atomicAccess.hpp"
#include "runtime/frame.inline.hpp"
#include "runtime/javaThread.hpp"
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/runtime/thread.inline.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

#include "gc/shared/tlab_globals.hpp"
#include "runtime/atomicAccess.hpp"
#include "utilities/permitForbiddenFunctions.hpp"
/*NEED*/ #include "utilities/permitForbiddenFunctions.hpp"

#ifdef MACOS_AARCH64
#include "runtime/os.hpp"
Expand Down
4 changes: 2 additions & 2 deletions src/hotspot/share/runtime/threadSMR.inline.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
#include "runtime/threadSMR.hpp"

#include "gc/shared/gc_globals.hpp"
#include "gc/shared/tlab_globals.hpp"
//NONEED #include "gc/shared/tlab_globals.hpp"
#include "memory/iterator.hpp"
#include "runtime/atomicAccess.hpp"
#include "runtime/javaThread.hpp"
#include "runtime/prefetch.inline.hpp"
#include "utilities/debug.hpp"
//NONEED #include "utilities/debug.hpp"
#include "utilities/macros.hpp"

ThreadsList::Iterator::Iterator(ThreadsList* list, uint i) :
Expand Down
10 changes: 5 additions & 5 deletions src/hotspot/share/runtime/vframe.inline.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@

#include "runtime/vframe.hpp"

#include "classfile/javaClasses.inline.hpp"
#include "oops/stackChunkOop.inline.hpp"
#include "runtime/continuationJavaClasses.inline.hpp"
#include "runtime/frame.inline.hpp"
#include "runtime/handles.inline.hpp"
//NONEED #include "classfile/javaClasses.inline.hpp"
//NONEED #include "oops/stackChunkOop.inline.hpp"
//NONEED #include "runtime/continuationJavaClasses.inline.hpp"
//NONEED #include "runtime/frame.inline.hpp"
//NONEED #include "runtime/handles.inline.hpp"
#include "runtime/javaThread.inline.hpp"

inline vframeStreamCommon::vframeStreamCommon(JavaThread* thread,
Expand Down
1 change: 1 addition & 0 deletions src/hotspot/share/runtime/vmOperations.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
#include "runtime/threads.hpp"
#include "runtime/threadSMR.inline.hpp"
#include "runtime/vmOperations.hpp"
#include "runtime/vmThread.hpp"
#include "services/threadService.hpp"
#include "utilities/growableArray.hpp"
#include "utilities/ticks.hpp"
Expand Down
1 change: 1 addition & 0 deletions src/hotspot/share/utilities/vmError.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include "compiler/disassembler.hpp"
#include "gc/shared/gcConfig.hpp"
#include "gc/shared/gcLogPrecious.hpp"
#include "interpreter/interpreter.hpp"
#include "jvm.h"
#include "logging/logConfiguration.hpp"
#include "memory/allocation.hpp"
Expand Down
1 change: 1 addition & 0 deletions test/hotspot/gtest/classfile/test_stringConversion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
* questions.
*/

#include "memory/resourceArea.hpp"
#include "runtime/interfaceSupport.inline.hpp"
#include "unittest.hpp"

Expand Down
1 change: 1 addition & 0 deletions test/hotspot/gtest/runtime/test_synchronizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

#include "classfile/vmClasses.hpp"
#include "memory/allocation.hpp"
#include "memory/resourceArea.hpp"
#include "memory/universe.hpp"
#include "runtime/interfaceSupport.inline.hpp"
#include "runtime/objectMonitor.hpp"
Expand Down