# HG changeset patch
# User stefank
# Date 1415792519 -3600
# Node ID e0391b2bf62508ca5012fc2f15a3c9224b74162e
# Parent  1d5707553fff36de118c52eba4e2a32375417ecb
8064581: Move INCLUDE_ALL_GCS include section to the end of the include list
Reviewed-by: jwilhelm, brutisso, coleenp, dholmes

diff -r 1d5707553fff -r e0391b2bf625 hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
--- a/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp	Tue Nov 11 17:05:33 2014 +0100
+++ b/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp	Wed Nov 12 12:41:59 2014 +0100
@@ -27,6 +27,7 @@
 #define CPU_PPC_VM_MACROASSEMBLER_PPC_HPP
 
 #include "asm/assembler.hpp"
+#include "utilities/macros.hpp"
 
 // MacroAssembler extends Assembler by a few frequently used macros.
 
diff -r 1d5707553fff -r e0391b2bf625 hotspot/src/share/vm/ci/ciObjectFactory.cpp
--- a/hotspot/src/share/vm/ci/ciObjectFactory.cpp	Tue Nov 11 17:05:33 2014 +0100
+++ b/hotspot/src/share/vm/ci/ciObjectFactory.cpp	Wed Nov 12 12:41:59 2014 +0100
@@ -46,6 +46,7 @@
 #include "oops/oop.inline.hpp"
 #include "oops/oop.inline2.hpp"
 #include "runtime/fieldType.hpp"
+#include "utilities/macros.hpp"
 #if INCLUDE_ALL_GCS
 # include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
 #endif
diff -r 1d5707553fff -r e0391b2bf625 hotspot/src/share/vm/classfile/stringTable.cpp
--- a/hotspot/src/share/vm/classfile/stringTable.cpp	Tue Nov 11 17:05:33 2014 +0100
+++ b/hotspot/src/share/vm/classfile/stringTable.cpp	Wed Nov 12 12:41:59 2014 +0100
@@ -36,6 +36,7 @@
 #include "runtime/atomic.inline.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "utilities/hashtable.inline.hpp"
+#include "utilities/macros.hpp"
 #if INCLUDE_ALL_GCS
 #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
 #include "gc_implementation/g1/g1StringDedup.hpp"
diff -r 1d5707553fff -r e0391b2bf625 hotspot/src/share/vm/gc_implementation/shared/gcTrace.cpp
--- a/hotspot/src/share/vm/gc_implementation/shared/gcTrace.cpp	Tue Nov 11 17:05:33 2014 +0100
+++ b/hotspot/src/share/vm/gc_implementation/shared/gcTrace.cpp	Wed Nov 12 12:41:59 2014 +0100
@@ -33,8 +33,8 @@
 #include "memory/referenceProcessorStats.hpp"
 #include "runtime/os.hpp"
 #include "utilities/globalDefinitions.hpp"
+#include "utilities/macros.hpp"
 #include "utilities/ticks.inline.hpp"
-
 #if INCLUDE_ALL_GCS
 #include "gc_implementation/g1/evacuationInfo.hpp"
 #endif
diff -r 1d5707553fff -r e0391b2bf625 hotspot/src/share/vm/gc_implementation/shared/gcTrace.hpp
--- a/hotspot/src/share/vm/gc_implementation/shared/gcTrace.hpp	Tue Nov 11 17:05:33 2014 +0100
+++ b/hotspot/src/share/vm/gc_implementation/shared/gcTrace.hpp	Wed Nov 12 12:41:59 2014 +0100
@@ -33,12 +33,11 @@
 #include "memory/allocation.hpp"
 #include "memory/metaspace.hpp"
 #include "memory/referenceType.hpp"
+#include "utilities/macros.hpp"
+#include "utilities/ticks.hpp"
 #if INCLUDE_ALL_GCS
 #include "gc_implementation/g1/g1YCTypes.hpp"
 #endif
-#include "utilities/macros.hpp"
-#include "utilities/ticks.hpp"
-
 
 class EvacuationInfo;
 class GCHeapSummary;
diff -r 1d5707553fff -r e0391b2bf625 hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp
--- a/hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp	Tue Nov 11 17:05:33 2014 +0100
+++ b/hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp	Wed Nov 12 12:41:59 2014 +0100
@@ -31,6 +31,7 @@
 #include "runtime/os.hpp"
 #include "trace/tracing.hpp"
 #include "trace/traceBackend.hpp"
+#include "utilities/macros.hpp"
 #if INCLUDE_ALL_GCS
 #include "gc_implementation/g1/evacuationInfo.hpp"
 #include "gc_implementation/g1/g1YCTypes.hpp"
diff -r 1d5707553fff -r e0391b2bf625 hotspot/src/share/vm/memory/binaryTreeDictionary.cpp
--- a/hotspot/src/share/vm/memory/binaryTreeDictionary.cpp	Tue Nov 11 17:05:33 2014 +0100
+++ b/hotspot/src/share/vm/memory/binaryTreeDictionary.cpp	Wed Nov 12 12:41:59 2014 +0100
@@ -23,8 +23,8 @@
  */
 
 #include "precompiled.hpp"
-#include "utilities/macros.hpp"
 #include "gc_implementation/shared/allocationStats.hpp"
+#include "gc_implementation/shared/spaceDecorator.hpp"
 #include "memory/binaryTreeDictionary.hpp"
 #include "memory/freeList.hpp"
 #include "memory/freeBlockDictionary.hpp"
@@ -32,7 +32,6 @@
 #include "runtime/globals.hpp"
 #include "utilities/ostream.hpp"
 #include "utilities/macros.hpp"
-#include "gc_implementation/shared/spaceDecorator.hpp"
 #if INCLUDE_ALL_GCS
 #include "gc_implementation/concurrentMarkSweep/adaptiveFreeList.hpp"
 #include "gc_implementation/concurrentMarkSweep/freeChunk.hpp"
diff -r 1d5707553fff -r e0391b2bf625 hotspot/src/share/vm/memory/freeBlockDictionary.cpp
--- a/hotspot/src/share/vm/memory/freeBlockDictionary.cpp	Tue Nov 11 17:05:33 2014 +0100
+++ b/hotspot/src/share/vm/memory/freeBlockDictionary.cpp	Wed Nov 12 12:41:59 2014 +0100
@@ -23,14 +23,13 @@
  */
 
 #include "precompiled.hpp"
+#include "memory/freeBlockDictionary.hpp"
+#include "memory/metachunk.hpp"
+#include "runtime/thread.inline.hpp"
 #include "utilities/macros.hpp"
 #if INCLUDE_ALL_GCS
 #include "gc_implementation/concurrentMarkSweep/freeChunk.hpp"
 #endif // INCLUDE_ALL_GCS
-#include "memory/freeBlockDictionary.hpp"
-#include "memory/metachunk.hpp"
-#include "runtime/thread.inline.hpp"
-#include "utilities/macros.hpp"
 
 #ifndef PRODUCT
 template <class Chunk> Mutex* FreeBlockDictionary<Chunk>::par_lock() const {
diff -r 1d5707553fff -r e0391b2bf625 hotspot/src/share/vm/memory/freeList.cpp
--- a/hotspot/src/share/vm/memory/freeList.cpp	Tue Nov 11 17:05:33 2014 +0100
+++ b/hotspot/src/share/vm/memory/freeList.cpp	Wed Nov 12 12:41:59 2014 +0100
@@ -31,7 +31,6 @@
 #include "runtime/mutex.hpp"
 #include "runtime/vmThread.hpp"
 #include "utilities/macros.hpp"
-
 #if INCLUDE_ALL_GCS
 #include "gc_implementation/concurrentMarkSweep/freeChunk.hpp"
 #endif // INCLUDE_ALL_GCS
diff -r 1d5707553fff -r e0391b2bf625 hotspot/src/share/vm/oops/oop.pcgc.inline.hpp
--- a/hotspot/src/share/vm/oops/oop.pcgc.inline.hpp	Tue Nov 11 17:05:33 2014 +0100
+++ b/hotspot/src/share/vm/oops/oop.pcgc.inline.hpp	Wed Nov 12 12:41:59 2014 +0100
@@ -25,8 +25,8 @@
 #ifndef SHARE_VM_OOPS_OOP_PCGC_INLINE_HPP
 #define SHARE_VM_OOPS_OOP_PCGC_INLINE_HPP
 
+#include "runtime/atomic.inline.hpp"
 #include "utilities/macros.hpp"
-#include "runtime/atomic.inline.hpp"
 #if INCLUDE_ALL_GCS
 #include "gc_implementation/parNew/parNewGeneration.hpp"
 #include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
diff -r 1d5707553fff -r e0391b2bf625 hotspot/src/share/vm/prims/jni.cpp
--- a/hotspot/src/share/vm/prims/jni.cpp	Tue Nov 11 17:05:33 2014 +0100
+++ b/hotspot/src/share/vm/prims/jni.cpp	Wed Nov 12 12:41:59 2014 +0100
@@ -32,10 +32,6 @@
 #include "classfile/systemDictionary.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "interpreter/linkResolver.hpp"
-#include "utilities/macros.hpp"
-#if INCLUDE_ALL_GCS
-#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
-#endif // INCLUDE_ALL_GCS
 #include "memory/allocation.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/gcLocker.inline.hpp"
@@ -81,6 +77,10 @@
 #include "utilities/dtrace.hpp"
 #include "utilities/events.hpp"
 #include "utilities/histogram.hpp"
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
+#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
+#endif // INCLUDE_ALL_GCS
 
 static jint CurrentVersion = JNI_VERSION_1_8;
 
diff -r 1d5707553fff -r e0391b2bf625 hotspot/src/share/vm/prims/unsafe.cpp
--- a/hotspot/src/share/vm/prims/unsafe.cpp	Tue Nov 11 17:05:33 2014 +0100
+++ b/hotspot/src/share/vm/prims/unsafe.cpp	Wed Nov 12 12:41:59 2014 +0100
@@ -24,10 +24,6 @@
 
 #include "precompiled.hpp"
 #include "classfile/vmSymbols.hpp"
-#include "utilities/macros.hpp"
-#if INCLUDE_ALL_GCS
-#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
-#endif // INCLUDE_ALL_GCS
 #include "memory/allocation.inline.hpp"
 #include "prims/jni.h"
 #include "prims/jvm.h"
@@ -43,6 +39,10 @@
 #include "trace/tracing.hpp"
 #include "utilities/copy.hpp"
 #include "utilities/dtrace.hpp"
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
+#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
+#endif // INCLUDE_ALL_GCS
 
 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
 
diff -r 1d5707553fff -r e0391b2bf625 hotspot/src/share/vm/prims/whitebox.cpp
--- a/hotspot/src/share/vm/prims/whitebox.cpp	Tue Nov 11 17:05:33 2014 +0100
+++ b/hotspot/src/share/vm/prims/whitebox.cpp	Wed Nov 12 12:41:59 2014 +0100
@@ -23,44 +23,37 @@
  */
 
 #include "precompiled.hpp"
-
+#include "classfile/classLoaderData.hpp"
+#include "classfile/stringTable.hpp"
 #include "code/codeCache.hpp"
+#include "compiler/compileBroker.hpp"
 #include "memory/metadataFactory.hpp"
 #include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
-
-#include "classfile/stringTable.hpp"
-#include "classfile/classLoaderData.hpp"
-
+#include "prims/wbtestmethods/parserTests.hpp"
 #include "prims/whitebox.hpp"
-#include "prims/wbtestmethods/parserTests.hpp"
-
-#include "runtime/thread.hpp"
 #include "runtime/arguments.hpp"
+#include "runtime/compilationPolicy.hpp"
 #include "runtime/interfaceSupport.hpp"
 #include "runtime/os.hpp"
+#include "runtime/thread.hpp"
 #include "runtime/vm_version.hpp"
-
 #include "utilities/array.hpp"
 #include "utilities/debug.hpp"
+#include "utilities/exceptions.hpp"
 #include "utilities/macros.hpp"
-#include "utilities/exceptions.hpp"
-
 #if INCLUDE_ALL_GCS
 #include "gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp"
 #include "gc_implementation/g1/concurrentMark.hpp"
 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
 #include "gc_implementation/g1/heapRegionRemSet.hpp"
 #endif // INCLUDE_ALL_GCS
-
 #if INCLUDE_NMT
 #include "services/mallocSiteTable.hpp"
 #include "services/memTracker.hpp"
 #include "utilities/nativeCallStack.hpp"
 #endif // INCLUDE_NMT
 
-#include "compiler/compileBroker.hpp"
-#include "runtime/compilationPolicy.hpp"
 
 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
 
diff -r 1d5707553fff -r e0391b2bf625 hotspot/src/share/vm/runtime/globals.cpp
--- a/hotspot/src/share/vm/runtime/globals.cpp	Tue Nov 11 17:05:33 2014 +0100
+++ b/hotspot/src/share/vm/runtime/globals.cpp	Wed Nov 12 12:41:59 2014 +0100
@@ -28,10 +28,10 @@
 #include "runtime/arguments.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/globals_extension.hpp"
+#include "trace/tracing.hpp"
 #include "utilities/ostream.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/top.hpp"
-#include "trace/tracing.hpp"
 #if INCLUDE_ALL_GCS
 #include "gc_implementation/g1/g1_globals.hpp"
 #endif // INCLUDE_ALL_GCS