8229836: Remove include of globals.hpp from allocation.hpp
Reviewed-by: coleenp, kbarrett
--- a/src/hotspot/os/linux/gc/z/zNUMA_linux.cpp Fri Aug 23 23:27:19 2019 +0000
+++ b/src/hotspot/os/linux/gc/z/zNUMA_linux.cpp Mon Aug 26 09:13:38 2019 +0200
@@ -24,6 +24,7 @@
#include "gc/z/zErrno.hpp"
#include "gc/z/zCPU.hpp"
#include "gc/z/zNUMA.hpp"
+#include "runtime/globals.hpp"
#include "runtime/os.hpp"
#include "utilities/debug.hpp"
--- a/src/hotspot/os/linux/osContainer_linux.cpp Fri Aug 23 23:27:19 2019 +0000
+++ b/src/hotspot/os/linux/osContainer_linux.cpp Mon Aug 26 09:13:38 2019 +0200
@@ -27,6 +27,7 @@
#include <errno.h>
#include "utilities/globalDefinitions.hpp"
#include "memory/allocation.hpp"
+#include "runtime/globals.hpp"
#include "runtime/os.hpp"
#include "logging/log.hpp"
#include "osContainer_linux.hpp"
@@ -673,4 +674,3 @@
return shares;
}
-
--- a/src/hotspot/os_cpu/linux_x86/gc/z/zPhysicalMemoryBacking_linux_x86.cpp Fri Aug 23 23:27:19 2019 +0000
+++ b/src/hotspot/os_cpu/linux_x86/gc/z/zPhysicalMemoryBacking_linux_x86.cpp Mon Aug 26 09:13:38 2019 +0200
@@ -32,6 +32,7 @@
#include "gc/z/zPhysicalMemory.inline.hpp"
#include "gc/z/zPhysicalMemoryBacking_linux_x86.hpp"
#include "logging/log.hpp"
+#include "runtime/globals.hpp"
#include "runtime/init.hpp"
#include "runtime/os.hpp"
#include "utilities/align.hpp"
--- a/src/hotspot/share/code/vmreg.hpp Fri Aug 23 23:27:19 2019 +0000
+++ b/src/hotspot/share/code/vmreg.hpp Mon Aug 26 09:13:38 2019 +0200
@@ -26,6 +26,7 @@
#define SHARE_CODE_VMREG_HPP
#include "asm/register.hpp"
+#include "runtime/globals.hpp"
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
#include "utilities/ostream.hpp"
--- a/src/hotspot/share/gc/cms/allocationStats.hpp Fri Aug 23 23:27:19 2019 +0000
+++ b/src/hotspot/share/gc/cms/allocationStats.hpp Mon Aug 26 09:13:38 2019 +0200
@@ -27,6 +27,7 @@
#include "gc/shared/gcUtil.hpp"
#include "logging/log.hpp"
+#include "runtime/globals.hpp"
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
--- a/src/hotspot/share/gc/g1/g1Analytics.cpp Fri Aug 23 23:27:19 2019 +0000
+++ b/src/hotspot/share/gc/g1/g1Analytics.cpp Mon Aug 26 09:13:38 2019 +0200
@@ -25,6 +25,7 @@
#include "precompiled.hpp"
#include "gc/g1/g1Analytics.hpp"
#include "gc/g1/g1Predictions.hpp"
+#include "runtime/globals.hpp"
#include "runtime/os.hpp"
#include "utilities/debug.hpp"
#include "utilities/numberSeq.hpp"
--- a/src/hotspot/share/gc/shared/gcOverheadChecker.hpp Fri Aug 23 23:27:19 2019 +0000
+++ b/src/hotspot/share/gc/shared/gcOverheadChecker.hpp Mon Aug 26 09:13:38 2019 +0200
@@ -28,6 +28,7 @@
#include "memory/allocation.hpp"
#include "gc/shared/gcCause.hpp"
+#include "runtime/globals.hpp"
class SoftRefPolicy;
--- a/src/hotspot/share/gc/z/zValue.hpp Fri Aug 23 23:27:19 2019 +0000
+++ b/src/hotspot/share/gc/z/zValue.hpp Mon Aug 26 09:13:38 2019 +0200
@@ -30,6 +30,7 @@
#include "gc/z/zNUMA.hpp"
#include "gc/z/zThread.hpp"
#include "gc/z/zUtils.hpp"
+#include "runtime/globals.hpp"
#include "utilities/align.hpp"
template <typename S>
--- a/src/hotspot/share/memory/allocation.hpp Fri Aug 23 23:27:19 2019 +0000
+++ b/src/hotspot/share/memory/allocation.hpp Mon Aug 26 09:13:38 2019 +0200
@@ -25,12 +25,12 @@
#ifndef SHARE_MEMORY_ALLOCATION_HPP
#define SHARE_MEMORY_ALLOCATION_HPP
-#include "runtime/globals.hpp"
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
#include <new>
+class outputStream;
class Thread;
class AllocFailStrategy {
--- a/src/hotspot/share/memory/allocation.inline.hpp Fri Aug 23 23:27:19 2019 +0000
+++ b/src/hotspot/share/memory/allocation.inline.hpp Mon Aug 26 09:13:38 2019 +0200
@@ -26,6 +26,7 @@
#define SHARE_MEMORY_ALLOCATION_INLINE_HPP
#include "runtime/atomic.hpp"
+#include "runtime/globals.hpp"
#include "runtime/os.hpp"
#include "services/memTracker.hpp"
#include "utilities/align.hpp"
--- a/src/hotspot/share/memory/metaspace.hpp Fri Aug 23 23:27:19 2019 +0000
+++ b/src/hotspot/share/memory/metaspace.hpp Mon Aug 26 09:13:38 2019 +0200
@@ -29,6 +29,7 @@
#include "memory/metaspaceChunkFreeListSummary.hpp"
#include "memory/virtualspace.hpp"
#include "memory/metaspace/metaspaceSizesSnapshot.hpp"
+#include "runtime/globals.hpp"
#include "utilities/exceptions.hpp"
// Metaspace
--- a/src/hotspot/share/oops/accessBackend.hpp Fri Aug 23 23:27:19 2019 +0000
+++ b/src/hotspot/share/oops/accessBackend.hpp Mon Aug 26 09:13:38 2019 +0200
@@ -38,6 +38,7 @@
#include "metaprogramming/isVolatile.hpp"
#include "oops/accessDecorators.hpp"
#include "oops/oopsHierarchy.hpp"
+#include "runtime/globals.hpp"
#include "utilities/debug.hpp"
#include "utilities/globalDefinitions.hpp"
--- a/src/hotspot/share/oops/markWord.hpp Fri Aug 23 23:27:19 2019 +0000
+++ b/src/hotspot/share/oops/markWord.hpp Mon Aug 26 09:13:38 2019 +0200
@@ -28,6 +28,7 @@
#include "metaprogramming/integralConstant.hpp"
#include "metaprogramming/primitiveConversions.hpp"
#include "oops/oopsHierarchy.hpp"
+#include "runtime/globals.hpp"
// The markWord describes the header of an object.
//
--- a/src/hotspot/share/oops/oopsHierarchy.hpp Fri Aug 23 23:27:19 2019 +0000
+++ b/src/hotspot/share/oops/oopsHierarchy.hpp Mon Aug 26 09:13:38 2019 +0200
@@ -73,7 +73,7 @@
class PromotedObject;
class oopDesc;
-extern bool CheckUnhandledOops;
+extern "C" bool CheckUnhandledOops;
class oop {
oopDesc* _o;
--- a/src/hotspot/share/runtime/perfMemory.hpp Fri Aug 23 23:27:19 2019 +0000
+++ b/src/hotspot/share/runtime/perfMemory.hpp Mon Aug 26 09:13:38 2019 +0200
@@ -25,6 +25,7 @@
#ifndef SHARE_RUNTIME_PERFMEMORY_HPP
#define SHARE_RUNTIME_PERFMEMORY_HPP
+#include "runtime/globals.hpp"
#include "utilities/exceptions.hpp"
/*
--- a/src/hotspot/share/utilities/globalDefinitions.cpp Fri Aug 23 23:27:19 2019 +0000
+++ b/src/hotspot/share/utilities/globalDefinitions.cpp Mon Aug 26 09:13:38 2019 +0200
@@ -23,6 +23,7 @@
*/
#include "precompiled.hpp"
+#include "runtime/globals.hpp"
#include "runtime/os.hpp"
#include "utilities/globalDefinitions.hpp"
--- a/src/hotspot/share/utilities/virtualizationSupport.cpp Fri Aug 23 23:27:19 2019 +0000
+++ b/src/hotspot/share/utilities/virtualizationSupport.cpp Mon Aug 26 09:13:38 2019 +0200
@@ -24,6 +24,7 @@
*/
#include "precompiled.hpp"
+#include "runtime/globals.hpp"
#include "runtime/os.hpp"
#include "utilities/virtualizationSupport.hpp"
@@ -101,4 +102,3 @@
}
}
}
-
--- a/test/hotspot/gtest/runtime/test_os_linux.cpp Fri Aug 23 23:27:19 2019 +0000
+++ b/test/hotspot/gtest/runtime/test_os_linux.cpp Mon Aug 26 09:13:38 2019 +0200
@@ -27,7 +27,9 @@
#include <sys/mman.h>
+#include "runtime/globals.hpp"
#include "runtime/os.hpp"
+#include "utilities/align.hpp"
#include "unittest.hpp"
namespace {
--- a/test/hotspot/gtest/utilities/test_globalDefinitions.cpp Fri Aug 23 23:27:19 2019 +0000
+++ b/test/hotspot/gtest/utilities/test_globalDefinitions.cpp Mon Aug 26 09:13:38 2019 +0200
@@ -24,6 +24,7 @@
#include "precompiled.hpp"
#include "runtime/os.hpp"
#include "unittest.hpp"
+#include "utilities/align.hpp"
#include "utilities/globalDefinitions.hpp"
static ::testing::AssertionResult testPageAddress(