Skip to content
Permalink
Browse files
8261106: Reduce inclusion of jniHandles.hpp
Reviewed-by: coleenp, hseigel
  • Loading branch information
iklam committed Feb 4, 2021
1 parent d9aefa3 commit c59e4b66bb85471314cf469ca56213207a2ba62e
Showing with 36 additions and 8 deletions.
  1. +1 −0 src/hotspot/cpu/aarch64/jvmciCodeInstaller_aarch64.cpp
  2. +1 −0 src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
  3. +1 −0 src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
  4. +1 −0 src/hotspot/cpu/arm/jniFastGetField_arm.cpp
  5. +1 −0 src/hotspot/cpu/arm/macroAssembler_arm.cpp
  6. +1 −0 src/hotspot/cpu/arm/sharedRuntime_arm.cpp
  7. +1 −0 src/hotspot/cpu/arm/templateInterpreterGenerator_arm.cpp
  8. +1 −0 src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.cpp
  9. +1 −0 src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
  10. +1 −0 src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
  11. +1 −0 src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp
  12. +1 −0 src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.cpp
  13. +1 −0 src/hotspot/cpu/s390/sharedRuntime_s390.cpp
  14. +1 −0 src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
  15. +1 −0 src/hotspot/cpu/x86/jvmciCodeInstaller_x86.cpp
  16. +1 −0 src/hotspot/cpu/x86/macroAssembler_x86.cpp
  17. +1 −0 src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
  18. +1 −0 src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
  19. +1 −0 src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
  20. +0 −1 src/hotspot/share/ci/ciBaseObject.hpp
  21. +0 −1 src/hotspot/share/ci/ciMetadata.hpp
  22. +0 −1 src/hotspot/share/ci/ciObject.hpp
  23. +0 −1 src/hotspot/share/classfile/moduleEntry.hpp
  24. +1 −0 src/hotspot/share/compiler/compileTask.cpp
  25. +1 −0 src/hotspot/share/gc/shared/concurrentGCThread.cpp
  26. +0 −1 src/hotspot/share/gc/shared/gcVMOperations.hpp
  27. +1 −0 src/hotspot/share/gc/shenandoah/shenandoahRootVerifier.cpp
  28. +1 −0 src/hotspot/share/jfr/dcmd/jfrDcmds.cpp
  29. +1 −0 src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
  30. +1 −0 src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.cpp
  31. +1 −0 src/hotspot/share/jfr/writers/jfrWriterHost.inline.hpp
  32. +1 −0 src/hotspot/share/jvmci/jvmciEnv.hpp
  33. +0 −1 src/hotspot/share/jvmci/jvmciJavaClasses.hpp
  34. +1 −0 src/hotspot/share/memory/universe.cpp
  35. +1 −0 src/hotspot/share/prims/jvmtiEnter.xsl
  36. +1 −0 src/hotspot/share/prims/jvmtiImpl.cpp
  37. +1 −0 src/hotspot/share/runtime/os.cpp
  38. +1 −1 src/hotspot/share/runtime/thread.hpp
  39. +1 −0 src/hotspot/share/runtime/vmOperations.cpp
  40. +1 −0 src/hotspot/share/runtime/vmStructs.cpp
  41. +1 −0 src/hotspot/share/runtime/vmThread.cpp
  42. +1 −0 src/hotspot/share/services/diagnosticCommand.cpp
  43. +0 −1 src/hotspot/share/services/threadService.hpp
@@ -30,6 +30,7 @@
#include "jvmci/jvmciJavaClasses.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/sharedRuntime.hpp"
#include "vmreg_aarch64.inline.hpp"

@@ -39,6 +39,7 @@
#include "oops/compiledICHolder.hpp"
#include "oops/klass.inline.hpp"
#include "prims/methodHandles.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/safepointMechanism.hpp"
#include "runtime/sharedRuntime.hpp"
#include "runtime/signature.hpp"
@@ -45,6 +45,7 @@
#include "runtime/arguments.hpp"
#include "runtime/deoptimization.hpp"
#include "runtime/frame.inline.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/sharedRuntime.hpp"
#include "runtime/stubRoutines.hpp"
#include "runtime/synchronizer.hpp"
@@ -30,6 +30,7 @@
#include "prims/jniFastGetField.hpp"
#include "prims/jvm_misc.hpp"
#include "prims/jvmtiExport.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/safepoint.hpp"

#define __ masm->
@@ -41,6 +41,7 @@
#include "prims/methodHandles.hpp"
#include "runtime/biasedLocking.hpp"
#include "runtime/interfaceSupport.inline.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/objectMonitor.hpp"
#include "runtime/os.hpp"
#include "runtime/sharedRuntime.hpp"
@@ -34,6 +34,7 @@
#include "oops/compiledICHolder.hpp"
#include "oops/klass.inline.hpp"
#include "prims/methodHandles.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/sharedRuntime.hpp"
#include "runtime/safepointMechanism.hpp"
#include "runtime/stubRoutines.hpp"
@@ -42,6 +42,7 @@
#include "runtime/arguments.hpp"
#include "runtime/deoptimization.hpp"
#include "runtime/frame.inline.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/sharedRuntime.hpp"
#include "runtime/stubRoutines.hpp"
#include "runtime/synchronizer.hpp"
@@ -34,6 +34,7 @@
#include "gc/g1/g1ThreadLocalData.hpp"
#include "gc/g1/heapRegion.hpp"
#include "interpreter/interp_masm.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/sharedRuntime.hpp"
#ifdef COMPILER1
#include "c1/c1_LIRAssembler.hpp"
@@ -36,6 +36,7 @@
#include "oops/compiledICHolder.hpp"
#include "oops/klass.inline.hpp"
#include "prims/methodHandles.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/safepointMechanism.hpp"
#include "runtime/sharedRuntime.hpp"
#include "runtime/signature.hpp"
@@ -42,6 +42,7 @@
#include "runtime/arguments.hpp"
#include "runtime/deoptimization.hpp"
#include "runtime/frame.inline.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/sharedRuntime.hpp"
#include "runtime/stubRoutines.hpp"
#include "runtime/synchronizer.hpp"
@@ -35,6 +35,7 @@
#include "gc/g1/g1ThreadLocalData.hpp"
#include "gc/g1/heapRegion.hpp"
#include "interpreter/interp_masm.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/sharedRuntime.hpp"
#ifdef COMPILER1
#include "c1/c1_LIRAssembler.hpp"
@@ -28,6 +28,7 @@
#include "gc/shared/barrierSetAssembler.hpp"
#include "interpreter/interp_masm.hpp"
#include "oops/compressedOops.hpp"
#include "runtime/jniHandles.hpp"

#define __ masm->

@@ -37,6 +37,7 @@
#include "oops/klass.inline.hpp"
#include "prims/methodHandles.hpp"
#include "registerSaver_s390.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/safepointMechanism.hpp"
#include "runtime/sharedRuntime.hpp"
#include "runtime/signature.hpp"
@@ -42,6 +42,7 @@
#include "runtime/arguments.hpp"
#include "runtime/deoptimization.hpp"
#include "runtime/frame.inline.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/sharedRuntime.hpp"
#include "runtime/stubRoutines.hpp"
#include "runtime/synchronizer.hpp"
@@ -26,6 +26,7 @@
#include "oops/oop.inline.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/javaCalls.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/sharedRuntime.hpp"
#include "jvmci/jvmci.hpp"
#include "jvmci/jvmciEnv.hpp"
@@ -42,6 +42,7 @@
#include "runtime/biasedLocking.hpp"
#include "runtime/flags/flagSetting.hpp"
#include "runtime/interfaceSupport.inline.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/objectMonitor.hpp"
#include "runtime/os.hpp"
#include "runtime/safepoint.hpp"
@@ -38,6 +38,7 @@
#include "oops/compiledICHolder.hpp"
#include "oops/klass.inline.hpp"
#include "prims/methodHandles.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/safepointMechanism.hpp"
#include "runtime/sharedRuntime.hpp"
#include "runtime/signature.hpp"
@@ -43,6 +43,7 @@
#include "oops/compiledICHolder.hpp"
#include "oops/klass.inline.hpp"
#include "prims/methodHandles.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/safepointMechanism.hpp"
#include "runtime/sharedRuntime.hpp"
#include "runtime/signature.hpp"
@@ -43,6 +43,7 @@
#include "runtime/arguments.hpp"
#include "runtime/deoptimization.hpp"
#include "runtime/frame.inline.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/sharedRuntime.hpp"
#include "runtime/stubRoutines.hpp"
#include "runtime/synchronizer.hpp"
@@ -27,7 +27,6 @@

#include "ci/ciClassList.hpp"
#include "memory/allocation.hpp"
#include "runtime/jniHandles.hpp"

// ciBaseObject
//
@@ -28,7 +28,6 @@
#include "ci/ciBaseObject.hpp"
#include "ci/ciClassList.hpp"
#include "runtime/handles.hpp"
#include "runtime/jniHandles.hpp"

// ciMetadata
//
@@ -28,7 +28,6 @@
#include "ci/ciBaseObject.hpp"
#include "ci/ciClassList.hpp"
#include "runtime/handles.hpp"
#include "runtime/jniHandles.hpp"

// ciObject
//
@@ -29,7 +29,6 @@
#include "classfile/classLoaderData.hpp"
#include "oops/oopHandle.hpp"
#include "oops/symbol.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/mutexLocker.hpp"
#include "utilities/growableArray.hpp"
#include "utilities/hashtable.hpp"
@@ -32,6 +32,7 @@
#include "logging/logStream.hpp"
#include "memory/resourceArea.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/jniHandles.hpp"

CompileTask* CompileTask::_task_free_list = NULL;

@@ -26,6 +26,7 @@
#include "gc/shared/concurrentGCThread.hpp"
#include "runtime/atomic.hpp"
#include "runtime/init.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/mutexLocker.hpp"
#include "runtime/os.hpp"

@@ -30,7 +30,6 @@
#include "memory/metaspace.hpp"
#include "prims/jvmtiExport.hpp"
#include "runtime/handles.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/synchronizer.hpp"
#include "runtime/vmOperations.hpp"

@@ -36,6 +36,7 @@
#include "gc/shenandoah/shenandoahUtils.hpp"
#include "gc/shared/oopStorage.inline.hpp"
#include "gc/shared/oopStorageSet.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/thread.hpp"
#include "utilities/debug.hpp"
#include "utilities/enumIterator.hpp"
@@ -34,6 +34,7 @@
#include "oops/oop.inline.hpp"
#include "oops/symbol.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/jniHandles.hpp"
#include "services/diagnosticArgument.hpp"
#include "services/diagnosticFramework.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -52,6 +52,7 @@
#include "oops/method.hpp"
#include "prims/jvmtiRedefineClasses.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/os.hpp"
#include "runtime/thread.inline.hpp"
#include "utilities/exceptions.hpp"
@@ -38,6 +38,7 @@
#include "oops/oop.hpp"
#include "prims/jvmtiThreadState.hpp"
#include "runtime/frame.inline.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/mutexLocker.hpp"
#include "runtime/vframe_hp.hpp"
#include "services/management.hpp"
@@ -34,6 +34,7 @@
#include "oops/oop.hpp"
#include "oops/symbol.hpp"
#include "oops/typeArrayOop.inline.hpp"
#include "runtime/jniHandles.hpp"

inline bool compressed_integers() {
static const bool comp_integers = JfrOptionSet::compressed_integers();
@@ -27,6 +27,7 @@

#include "classfile/javaClasses.hpp"
#include "jvmci/jvmciJavaClasses.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/thread.hpp"

class CompileTask;
@@ -27,7 +27,6 @@
#include "classfile/vmSymbols.hpp"
#include "jvmci/jvmciExceptions.hpp"
#include "jvmci/jvmciObject.hpp"
#include "runtime/jniHandles.hpp"

/*
* This macro defines the structure of the JVMCI classes accessed from VM code. It is used to
@@ -66,6 +66,7 @@
#include "runtime/handles.inline.hpp"
#include "runtime/init.hpp"
#include "runtime/java.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/thread.inline.hpp"
#include "runtime/timerTrace.hpp"
#include "services/memoryService.hpp"
@@ -48,6 +48,7 @@
# include "prims/jvmtiRawMonitor.hpp"
# include "prims/jvmtiUtil.hpp"
# include "runtime/fieldDescriptor.inline.hpp"
# include "runtime/jniHandles.hpp"
# include "runtime/threadSMR.hpp"

</xsl:text>
@@ -45,6 +45,7 @@
#include "runtime/handles.inline.hpp"
#include "runtime/interfaceSupport.inline.hpp"
#include "runtime/javaCalls.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/os.hpp"
#include "runtime/serviceThread.hpp"
#include "runtime/signature.hpp"
@@ -52,6 +52,7 @@
#include "runtime/interfaceSupport.inline.hpp"
#include "runtime/java.hpp"
#include "runtime/javaCalls.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/mutexLocker.hpp"
#include "runtime/os.inline.hpp"
#include "runtime/osThread.hpp"
@@ -35,7 +35,6 @@
#include "runtime/globals.hpp"
#include "runtime/handshake.hpp"
#include "runtime/javaFrameAnchor.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/mutexLocker.hpp"
#include "runtime/os.hpp"
#include "runtime/park.hpp"
@@ -60,6 +59,7 @@ class ThreadSafepointState;
class ThreadsList;
class ThreadsSMRSupport;

class JNIHandleBlock;
class JvmtiRawMonitor;
class JvmtiSampledObjectAllocEventCollector;
class JvmtiThreadState;
@@ -41,6 +41,7 @@
#include "runtime/deoptimization.hpp"
#include "runtime/frame.inline.hpp"
#include "runtime/interfaceSupport.inline.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/synchronizer.hpp"
#include "runtime/thread.inline.hpp"
#include "runtime/threadSMR.inline.hpp"
@@ -89,6 +89,7 @@
#include "runtime/globals.hpp"
#include "runtime/java.hpp"
#include "runtime/javaCalls.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/monitorDeflationThread.hpp"
#include "runtime/notificationThread.hpp"
#include "runtime/os.hpp"
@@ -37,6 +37,7 @@
#include "runtime/atomic.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/interfaceSupport.inline.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/mutexLocker.hpp"
#include "runtime/os.hpp"
#include "runtime/perfData.hpp"
@@ -44,6 +44,7 @@
#include "runtime/handles.inline.hpp"
#include "runtime/interfaceSupport.inline.hpp"
#include "runtime/javaCalls.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/os.hpp"
#include "runtime/vm_version.hpp"
#include "services/diagnosticArgument.hpp"
@@ -30,7 +30,6 @@
#include "classfile/javaThreadStatus.hpp"
#include "runtime/handles.hpp"
#include "runtime/init.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/objectMonitor.hpp"
#include "runtime/perfData.hpp"
#include "runtime/safepoint.hpp"

0 comments on commit c59e4b6

Please sign in to comment.