changeset 10871:4823056a5bbd

Merge
author stefank
date Tue, 12 Apr 2016 09:08:48 +0000
parents 5bc83f454d50 90aeaed2b342
children f589cf9f3082 de653b60a98e
files src/share/vm/runtime/os.hpp src/share/vm/utilities/top.hpp
diffstat 73 files changed, 38 insertions(+), 123 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/aarch64/vm/debug_aarch64.cpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/cpu/aarch64/vm/debug_aarch64.cpp	Tue Apr 12 09:08:48 2016 +0000
@@ -30,6 +30,5 @@
 #include "runtime/init.hpp"
 #include "runtime/os.hpp"
 #include "utilities/debug.hpp"
-#include "utilities/top.hpp"
 
 void pd_ps(frame f) {}
--- a/src/cpu/aarch64/vm/frame_aarch64.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/cpu/aarch64/vm/frame_aarch64.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -27,7 +27,6 @@
 #define CPU_AARCH64_VM_FRAME_AARCH64_HPP
 
 #include "runtime/synchronizer.hpp"
-#include "utilities/top.hpp"
 
 // A frame represents a physical stack frame (an activation).  Frames can be
 // C or Java frames, and the Java frames can be interpreted or compiled.
--- a/src/cpu/aarch64/vm/nativeInst_aarch64.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/cpu/aarch64/vm/nativeInst_aarch64.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -30,7 +30,6 @@
 #include "memory/allocation.hpp"
 #include "runtime/icache.hpp"
 #include "runtime/os.hpp"
-#include "utilities/top.hpp"
 
 // We have interfaces for the following instructions:
 // - NativeInstruction
--- a/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp	Tue Apr 12 09:08:48 2016 +0000
@@ -39,7 +39,6 @@
 #include "runtime/stubCodeGenerator.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "runtime/thread.inline.hpp"
-#include "utilities/top.hpp"
 #ifdef COMPILER2
 #include "opto/runtime.hpp"
 #endif
--- a/src/cpu/ppc/vm/debug_ppc.cpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/cpu/ppc/vm/debug_ppc.cpp	Tue Apr 12 09:08:48 2016 +0000
@@ -30,6 +30,5 @@
 #include "runtime/init.hpp"
 #include "runtime/os.hpp"
 #include "utilities/debug.hpp"
-#include "utilities/top.hpp"
 
 void pd_ps(frame f) {}
--- a/src/cpu/ppc/vm/frame_ppc.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/cpu/ppc/vm/frame_ppc.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -27,7 +27,6 @@
 #define CPU_PPC_VM_FRAME_PPC_HPP
 
 #include "runtime/synchronizer.hpp"
-#include "utilities/top.hpp"
 
   //  C frame layout on PPC-64.
   //
--- a/src/cpu/ppc/vm/nativeInst_ppc.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/cpu/ppc/vm/nativeInst_ppc.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -31,7 +31,6 @@
 #include "memory/allocation.hpp"
 #include "runtime/icache.hpp"
 #include "runtime/os.hpp"
-#include "utilities/top.hpp"
 
 // We have interfaces for the following instructions:
 //
--- a/src/cpu/ppc/vm/stubGenerator_ppc.cpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/cpu/ppc/vm/stubGenerator_ppc.cpp	Tue Apr 12 09:08:48 2016 +0000
@@ -37,7 +37,6 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubCodeGenerator.hpp"
 #include "runtime/stubRoutines.hpp"
-#include "utilities/top.hpp"
 #include "runtime/thread.inline.hpp"
 
 #define __ _masm->
--- a/src/cpu/sparc/vm/debug_sparc.cpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/cpu/sparc/vm/debug_sparc.cpp	Tue Apr 12 09:08:48 2016 +0000
@@ -29,7 +29,6 @@
 #include "runtime/init.hpp"
 #include "runtime/os.hpp"
 #include "utilities/debug.hpp"
-#include "utilities/top.hpp"
 
 #ifndef PRODUCT
 
--- a/src/cpu/sparc/vm/frame_sparc.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/cpu/sparc/vm/frame_sparc.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -26,7 +26,6 @@
 #define CPU_SPARC_VM_FRAME_SPARC_HPP
 
 #include "runtime/synchronizer.hpp"
-#include "utilities/top.hpp"
 
 // A frame represents a physical stack frame (an activation).  Frames can be
 // C or Java frames, and the Java frames can be interpreted or compiled.
--- a/src/cpu/sparc/vm/nativeInst_sparc.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/cpu/sparc/vm/nativeInst_sparc.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -29,7 +29,6 @@
 #include "memory/allocation.hpp"
 #include "runtime/icache.hpp"
 #include "runtime/os.hpp"
-#include "utilities/top.hpp"
 
 // We have interface for the following instructions:
 // - NativeInstruction
--- a/src/cpu/sparc/vm/stubGenerator_sparc.cpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/cpu/sparc/vm/stubGenerator_sparc.cpp	Tue Apr 12 09:08:48 2016 +0000
@@ -37,7 +37,6 @@
 #include "runtime/stubCodeGenerator.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "runtime/thread.inline.hpp"
-#include "utilities/top.hpp"
 #ifdef COMPILER2
 #include "opto/runtime.hpp"
 #endif
--- a/src/cpu/x86/vm/debug_x86.cpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/cpu/x86/vm/debug_x86.cpp	Tue Apr 12 09:08:48 2016 +0000
@@ -29,6 +29,5 @@
 #include "runtime/init.hpp"
 #include "runtime/os.hpp"
 #include "utilities/debug.hpp"
-#include "utilities/top.hpp"
 
 void pd_ps(frame f) {}
--- a/src/cpu/x86/vm/frame_x86.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/cpu/x86/vm/frame_x86.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -26,7 +26,6 @@
 #define CPU_X86_VM_FRAME_X86_HPP
 
 #include "runtime/synchronizer.hpp"
-#include "utilities/top.hpp"
 
 // A frame represents a physical stack frame (an activation).  Frames can be
 // C or Java frames, and the Java frames can be interpreted or compiled.
--- a/src/cpu/x86/vm/nativeInst_x86.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/cpu/x86/vm/nativeInst_x86.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -29,7 +29,6 @@
 #include "memory/allocation.hpp"
 #include "runtime/icache.hpp"
 #include "runtime/os.hpp"
-#include "utilities/top.hpp"
 
 // We have interfaces for the following instructions:
 // - NativeInstruction
--- a/src/cpu/x86/vm/stubGenerator_x86_32.cpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/cpu/x86/vm/stubGenerator_x86_32.cpp	Tue Apr 12 09:08:48 2016 +0000
@@ -38,7 +38,6 @@
 #include "runtime/stubCodeGenerator.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "runtime/thread.inline.hpp"
-#include "utilities/top.hpp"
 #ifdef COMPILER2
 #include "opto/runtime.hpp"
 #endif
--- a/src/cpu/x86/vm/stubGenerator_x86_64.cpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/cpu/x86/vm/stubGenerator_x86_64.cpp	Tue Apr 12 09:08:48 2016 +0000
@@ -38,7 +38,6 @@
 #include "runtime/stubCodeGenerator.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "runtime/thread.inline.hpp"
-#include "utilities/top.hpp"
 #ifdef COMPILER2
 #include "opto/runtime.hpp"
 #endif
--- a/src/cpu/zero/vm/debug_zero.cpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/cpu/zero/vm/debug_zero.cpp	Tue Apr 12 09:08:48 2016 +0000
@@ -30,7 +30,6 @@
 #include "runtime/init.hpp"
 #include "runtime/os.hpp"
 #include "utilities/debug.hpp"
-#include "utilities/top.hpp"
 
 void pd_ps(frame f) {
   ShouldNotCallThis();
--- a/src/cpu/zero/vm/frame_zero.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/cpu/zero/vm/frame_zero.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -27,7 +27,6 @@
 #define CPU_ZERO_VM_FRAME_ZERO_HPP
 
 #include "runtime/synchronizer.hpp"
-#include "utilities/top.hpp"
 
 // A frame represents a physical stack frame on the Zero stack.
 
--- a/src/cpu/zero/vm/nativeInst_zero.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/cpu/zero/vm/nativeInst_zero.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -30,7 +30,6 @@
 #include "memory/allocation.hpp"
 #include "runtime/icache.hpp"
 #include "runtime/os.hpp"
-#include "utilities/top.hpp"
 
 // We have interfaces for the following instructions:
 // - NativeInstruction
--- a/src/cpu/zero/vm/stubGenerator_zero.cpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/cpu/zero/vm/stubGenerator_zero.cpp	Tue Apr 12 09:08:48 2016 +0000
@@ -40,7 +40,6 @@
 #include "runtime/stubRoutines.hpp"
 #include "runtime/thread.inline.hpp"
 #include "stack_zero.inline.hpp"
-#include "utilities/top.hpp"
 #ifdef COMPILER2
 #include "opto/runtime.hpp"
 #endif
--- a/src/share/vm/asm/assembler.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/asm/assembler.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -33,7 +33,6 @@
 #include "runtime/vm_version.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/growableArray.hpp"
-#include "utilities/top.hpp"
 
 // This file contains platform-independent assembler declarations.
 
--- a/src/share/vm/asm/register.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/asm/register.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -25,7 +25,8 @@
 #ifndef SHARE_VM_ASM_REGISTER_HPP
 #define SHARE_VM_ASM_REGISTER_HPP
 
-#include "utilities/top.hpp"
+#include "utilities/debug.hpp"
+#include "utilities/globalDefinitions.hpp"
 
 // Use AbstractRegister as shortcut
 class AbstractRegisterImpl;
--- a/src/share/vm/c1/c1_LIRAssembler.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/c1/c1_LIRAssembler.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -28,7 +28,6 @@
 #include "c1/c1_CodeStubs.hpp"
 #include "ci/ciMethodData.hpp"
 #include "oops/methodData.hpp"
-#include "utilities/top.hpp"
 
 class Compilation;
 class ScopeValue;
--- a/src/share/vm/ci/ciFlags.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/ci/ciFlags.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -29,6 +29,7 @@
 #include "memory/allocation.hpp"
 #include "prims/jvm.h"
 #include "utilities/accessFlags.hpp"
+#include "utilities/ostream.hpp"
 
 // ciFlags
 //
--- a/src/share/vm/classfile/classFileStream.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/classfile/classFileStream.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -25,8 +25,9 @@
 #ifndef SHARE_VM_CLASSFILE_CLASSFILESTREAM_HPP
 #define SHARE_VM_CLASSFILE_CLASSFILESTREAM_HPP
 
+#include "memory/allocation.hpp"
 #include "utilities/bytes.hpp"
-#include "utilities/top.hpp"
+#include "utilities/exceptions.hpp"
 
 // Input stream for reading .class file
 //
--- a/src/share/vm/code/relocInfo.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/code/relocInfo.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -26,8 +26,9 @@
 #define SHARE_VM_CODE_RELOCINFO_HPP
 
 #include "memory/allocation.hpp"
-#include "utilities/top.hpp"
+#include "runtime/os.hpp"
 
+class Metadata;
 class NativeMovConstReg;
 
 // Types in this file:
--- a/src/share/vm/code/vmreg.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/code/vmreg.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -28,10 +28,9 @@
 #include "asm/register.hpp"
 #include "memory/allocation.hpp"
 #include "utilities/globalDefinitions.hpp"
-
+#include "utilities/ostream.hpp"
 #ifdef COMPILER2
 #include "opto/adlcVMDeps.hpp"
-#include "utilities/ostream.hpp"
 #endif
 
 //------------------------------VMReg------------------------------------------
--- a/src/share/vm/gc/parallel/psAdaptiveSizePolicy.cpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/gc/parallel/psAdaptiveSizePolicy.cpp	Tue Apr 12 09:08:48 2016 +0000
@@ -32,7 +32,6 @@
 #include "gc/shared/gcPolicyCounters.hpp"
 #include "logging/log.hpp"
 #include "runtime/timer.hpp"
-#include "utilities/top.hpp"
 
 #include <math.h>
 
--- a/src/share/vm/interpreter/abstractInterpreter.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/interpreter/abstractInterpreter.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -30,7 +30,6 @@
 #include "interpreter/bytecodes.hpp"
 #include "runtime/thread.hpp"
 #include "runtime/vmThread.hpp"
-#include "utilities/top.hpp"
 
 // This file contains the platform-independent parts
 // of the abstract interpreter and the abstract interpreter generator.
--- a/src/share/vm/interpreter/bytecodeTracer.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/interpreter/bytecodeTracer.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -26,6 +26,7 @@
 #define SHARE_VM_INTERPRETER_BYTECODETRACER_HPP
 
 #include "memory/allocation.hpp"
+#include "utilities/ostream.hpp"
 
 // The BytecodeTracer is a helper class used by the interpreter for run-time
 // bytecode tracing. If bytecode tracing is turned on, trace() will be called
--- a/src/share/vm/interpreter/bytecodes.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/interpreter/bytecodes.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -26,11 +26,12 @@
 #define SHARE_VM_INTERPRETER_BYTECODES_HPP
 
 #include "memory/allocation.hpp"
-#include "utilities/top.hpp"
 
 // Bytecodes specifies all bytecodes used in the VM and
 // provides utility functions to get bytecode attributes.
 
+class Method;
+
 // NOTE: replicated in SA in vm/agent/sun/jvm/hotspot/interpreter/Bytecodes.java
 class Bytecodes: AllStatic {
  public:
--- a/src/share/vm/interpreter/interpreterRuntime.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/interpreter/interpreterRuntime.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -32,7 +32,6 @@
 #include "runtime/frame.inline.hpp"
 #include "runtime/signature.hpp"
 #include "runtime/thread.hpp"
-#include "utilities/top.hpp"
 
 // The InterpreterRuntime is called by the interpreter for everything
 // that cannot/should not be dealt with in assembly and needs C support.
--- a/src/share/vm/interpreter/linkResolver.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/interpreter/linkResolver.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -26,7 +26,6 @@
 #define SHARE_VM_INTERPRETER_LINKRESOLVER_HPP
 
 #include "oops/method.hpp"
-#include "utilities/top.hpp"
 
 // All the necessary definitions for run-time link resolution.
 
--- a/src/share/vm/memory/iterator.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/memory/iterator.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -27,7 +27,7 @@
 
 #include "memory/allocation.hpp"
 #include "memory/memRegion.hpp"
-#include "utilities/top.hpp"
+#include "oops/oopsHierarchy.hpp"
 
 class CodeBlob;
 class nmethod;
@@ -35,6 +35,7 @@
 class DataLayout;
 class KlassClosure;
 class ClassLoaderData;
+class Symbol;
 
 // The following classes are C++ `closures` for iterating over objects, roots and spaces
 
--- a/src/share/vm/oops/oop.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/oops/oop.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -30,7 +30,6 @@
 #include "memory/memRegion.hpp"
 #include "oops/metadata.hpp"
 #include "utilities/macros.hpp"
-#include "utilities/top.hpp"
 
 // oopDesc is the top baseclass for objects classes. The {name}Desc classes describe
 // the format of Java objects so the fields can be accessed from C++.
--- a/src/share/vm/oops/symbol.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/oops/symbol.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -25,9 +25,10 @@
 #ifndef SHARE_VM_OOPS_SYMBOL_HPP
 #define SHARE_VM_OOPS_SYMBOL_HPP
 
-#include "utilities/utf8.hpp"
 #include "memory/allocation.hpp"
 #include "runtime/atomic.hpp"
+#include "utilities/exceptions.hpp"
+#include "utilities/utf8.hpp"
 
 // A Symbol is a canonicalized string.
 // All Symbols reside in global SymbolTable and are reference counted.
--- a/src/share/vm/precompiled/precompiled.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/precompiled/precompiled.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -242,7 +242,6 @@
 # include "utilities/ostream.hpp"
 # include "utilities/preserveException.hpp"
 # include "utilities/sizes.hpp"
-# include "utilities/top.hpp"
 # include "utilities/utf8.hpp"
 #ifdef COMPILER2
 # include "libadt/dict.hpp"
--- a/src/share/vm/prims/jvm.cpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/prims/jvm.cpp	Tue Apr 12 09:08:48 2016 +0000
@@ -79,7 +79,6 @@
 #include "utilities/events.hpp"
 #include "utilities/histogram.hpp"
 #include "utilities/macros.hpp"
-#include "utilities/top.hpp"
 #include "utilities/utf8.hpp"
 #if INCLUDE_CDS
 #include "classfile/sharedClassUtil.hpp"
--- a/src/share/vm/prims/nativeLookup.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/prims/nativeLookup.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -25,8 +25,8 @@
 #ifndef SHARE_VM_PRIMS_NATIVELOOKUP_HPP
 #define SHARE_VM_PRIMS_NATIVELOOKUP_HPP
 
+#include "memory/allocation.hpp"
 #include "runtime/handles.hpp"
-#include "utilities/top.hpp"
 
 // NativeLookup provides an interface for finding DLL entry points for
 // Java native functions.
--- a/src/share/vm/runtime/arguments.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/runtime/arguments.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -31,7 +31,6 @@
 #include "runtime/os.hpp"
 #include "runtime/perfData.hpp"
 #include "utilities/debug.hpp"
-#include "utilities/top.hpp"
 
 // Arguments parses the command line and recognizes options
 
--- a/src/share/vm/runtime/basicLock.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/runtime/basicLock.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -27,7 +27,6 @@
 
 #include "oops/markOop.hpp"
 #include "runtime/handles.hpp"
-#include "utilities/top.hpp"
 
 class BasicLock VALUE_OBJ_CLASS_SPEC {
   friend class VMStructs;
--- a/src/share/vm/runtime/frame.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/runtime/frame.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -29,7 +29,6 @@
 #include "runtime/basicLock.hpp"
 #include "runtime/monitorChunk.hpp"
 #include "runtime/registerMap.hpp"
-#include "utilities/top.hpp"
 #ifdef TARGET_ARCH_zero
 # include "stack_zero.hpp"
 #endif
--- a/src/share/vm/runtime/globals.cpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/runtime/globals.cpp	Tue Apr 12 09:08:48 2016 +0000
@@ -35,7 +35,6 @@
 #include "trace/tracing.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/ostream.hpp"
-#include "utilities/top.hpp"
 #if INCLUDE_ALL_GCS
 #include "gc/g1/g1_globals.hpp"
 #endif // INCLUDE_ALL_GCS
--- a/src/share/vm/runtime/globals_extension.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/runtime/globals_extension.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -27,7 +27,19 @@
 
 #include "runtime/globals.hpp"
 #include "utilities/macros.hpp"
-#include "utilities/top.hpp"
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
+#include "gc/g1/g1_globals.hpp"
+#endif
+#if INCLUDE_JVMCI
+#include "jvmci/jvmci_globals.hpp"
+#endif
+#ifdef COMPILER1
+#include "c1/c1_globals.hpp"
+#endif
+#ifdef COMPILER2
+#include "opto/c2_globals.hpp"
+#endif
 
 // Construct enum of Flag_<cmdline-arg> constants.
 
--- a/src/share/vm/runtime/init.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/runtime/init.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -25,7 +25,7 @@
 #ifndef SHARE_VM_RUNTIME_INIT_HPP
 #define SHARE_VM_RUNTIME_INIT_HPP
 
-#include "utilities/top.hpp"
+#include "utilities/globalDefinitions.hpp"
 
 // init_globals replaces C++ global objects so we can use the standard linker
 // to link Delta (which is at least twice as fast as using the GNU C++ linker).
--- a/src/share/vm/runtime/interfaceSupport.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/runtime/interfaceSupport.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -35,7 +35,6 @@
 #include "runtime/vmThread.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/preserveException.hpp"
-#include "utilities/top.hpp"
 
 // Wrapper for all entry points to the virtual machine.
 // The HandleMarkCleaner is a faster version of HandleMark.
--- a/src/share/vm/runtime/jniHandles.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/runtime/jniHandles.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -25,8 +25,8 @@
 #ifndef SHARE_VM_RUNTIME_JNIHANDLES_HPP
 #define SHARE_VM_RUNTIME_JNIHANDLES_HPP
 
+#include "memory/allocation.hpp"
 #include "runtime/handles.hpp"
-#include "utilities/top.hpp"
 
 class JNIHandleBlock;
 
--- a/src/share/vm/runtime/os.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/runtime/os.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -28,7 +28,6 @@
 #include "jvmtifiles/jvmti.h"
 #include "runtime/extendedPC.hpp"
 #include "runtime/handles.hpp"
-#include "utilities/top.hpp"
 #ifdef TARGET_OS_FAMILY_linux
 # include "jvm_linux.h"
 # include <setjmp.h>
--- a/src/share/vm/runtime/osThread.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/runtime/osThread.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -29,7 +29,6 @@
 #include "runtime/handles.hpp"
 #include "runtime/javaFrameAnchor.hpp"
 #include "runtime/objectMonitor.hpp"
-#include "utilities/top.hpp"
 
 // The OSThread class holds OS-specific thread information.  It is equivalent
 // to the sys_thread_t structure of the classic JVM implementation.
--- a/src/share/vm/runtime/signature.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/runtime/signature.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -27,7 +27,6 @@
 
 #include "memory/allocation.hpp"
 #include "oops/method.hpp"
-#include "utilities/top.hpp"
 
 // SignatureIterators iterate over a Java signature (or parts of it).
 // (Syntax according to: "The Java Virtual Machine Specification" by
--- a/src/share/vm/runtime/stackValue.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/runtime/stackValue.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -27,7 +27,6 @@
 
 #include "code/location.hpp"
 #include "runtime/handles.hpp"
-#include "utilities/top.hpp"
 
 class StackValue : public ResourceObj {
  private:
--- a/src/share/vm/runtime/stubRoutines.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/runtime/stubRoutines.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -30,7 +30,6 @@
 #include "runtime/frame.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/stubCodeGenerator.hpp"
-#include "utilities/top.hpp"
 
 // StubRoutines provides entry points to assembly routines used by
 // compiled code and the run-time system. Platform-specific entry
--- a/src/share/vm/runtime/synchronizer.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/runtime/synchronizer.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -29,8 +29,6 @@
 #include "runtime/basicLock.hpp"
 #include "runtime/handles.hpp"
 #include "runtime/perfData.hpp"
-#include "utilities/top.hpp"
-
 
 class ObjectMonitor;
 
--- a/src/share/vm/runtime/task.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/runtime/task.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -25,7 +25,8 @@
 #ifndef SHARE_VM_RUNTIME_TASK_HPP
 #define SHARE_VM_RUNTIME_TASK_HPP
 
-#include "utilities/top.hpp"
+#include "memory/allocation.hpp"
+#include "runtime/timer.hpp"
 
 // A PeriodicTask has the sole purpose of executing its task
 // function with regular intervals.
--- a/src/share/vm/runtime/thread.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/runtime/thread.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -46,7 +46,6 @@
 #include "trace/traceMacros.hpp"
 #include "utilities/exceptions.hpp"
 #include "utilities/macros.hpp"
-#include "utilities/top.hpp"
 #if INCLUDE_ALL_GCS
 #include "gc/g1/dirtyCardQueue.hpp"
 #include "gc/g1/satbMarkQueue.hpp"
--- a/src/share/vm/runtime/threadLocalStorage.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/runtime/threadLocalStorage.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -25,7 +25,7 @@
 #ifndef SHARE_VM_RUNTIME_THREADLOCALSTORAGE_HPP
 #define SHARE_VM_RUNTIME_THREADLOCALSTORAGE_HPP
 
-#include "utilities/top.hpp"
+#include "memory/allocation.hpp"
 
 // forward-decl as we can't have an include cycle
 class Thread;
--- a/src/share/vm/runtime/vm_operations.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/runtime/vm_operations.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -29,7 +29,6 @@
 #include "memory/allocation.hpp"
 #include "oops/oop.hpp"
 #include "runtime/thread.hpp"
-#include "utilities/top.hpp"
 #include "code/codeCache.hpp"
 
 // The following classes are used for operations
--- a/src/share/vm/utilities/accessFlags.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/utilities/accessFlags.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -25,8 +25,9 @@
 #ifndef SHARE_VM_UTILITIES_ACCESSFLAGS_HPP
 #define SHARE_VM_UTILITIES_ACCESSFLAGS_HPP
 
+#include "memory/allocation.hpp"
 #include "prims/jvm.h"
-#include "utilities/top.hpp"
+#include "utilities/macros.hpp"
 
 // AccessFlags is an abstraction over Java access flags.
 
--- a/src/share/vm/utilities/bitMap.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/utilities/bitMap.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -26,7 +26,6 @@
 #define SHARE_VM_UTILITIES_BITMAP_HPP
 
 #include "memory/allocation.hpp"
-#include "utilities/top.hpp"
 
 // Forward decl;
 class BitMapClosure;
--- a/src/share/vm/utilities/constantTag.cpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/utilities/constantTag.cpp	Tue Apr 12 09:08:48 2016 +0000
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "utilities/constantTag.hpp"
+#include "utilities/ostream.hpp"
 
 #ifndef PRODUCT
 
--- a/src/share/vm/utilities/constantTag.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/utilities/constantTag.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -25,8 +25,8 @@
 #ifndef SHARE_VM_UTILITIES_CONSTANTTAG_HPP
 #define SHARE_VM_UTILITIES_CONSTANTTAG_HPP
 
+#include "memory/allocation.hpp"
 #include "prims/jvm.h"
-#include "utilities/top.hpp"
 
 // constant tags in Java .class files
 
--- a/src/share/vm/utilities/debug.cpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/utilities/debug.cpp	Tue Apr 12 09:08:48 2016 +0000
@@ -52,7 +52,6 @@
 #include "utilities/defaultStream.hpp"
 #include "utilities/events.hpp"
 #include "utilities/macros.hpp"
-#include "utilities/top.hpp"
 #include "utilities/vmError.hpp"
 
 #if INCLUDE_TRACE
--- a/src/share/vm/utilities/events.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/utilities/events.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -28,7 +28,6 @@
 #include "memory/allocation.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/thread.hpp"
-#include "utilities/top.hpp"
 #include "utilities/vmError.hpp"
 
 // Events and EventMark provide interfaces to log events taking place in the vm.
--- a/src/share/vm/utilities/exceptions.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/utilities/exceptions.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -47,7 +47,6 @@
 
 
 // Forward declarations to be independent of the include structure.
-// This allows us to have exceptions.hpp included in top.hpp.
 
 class Thread;
 class Handle;
--- a/src/share/vm/utilities/globalDefinitions.cpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/utilities/globalDefinitions.cpp	Tue Apr 12 09:08:48 2016 +0000
@@ -25,7 +25,6 @@
 #include "precompiled.hpp"
 #include "runtime/os.hpp"
 #include "utilities/globalDefinitions.hpp"
-#include "utilities/top.hpp"
 
 // Basic error support
 
--- a/src/share/vm/utilities/growableArray.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/utilities/growableArray.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -29,7 +29,6 @@
 #include "memory/allocation.inline.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
-#include "utilities/top.hpp"
 
 // A growable array.
 
--- a/src/share/vm/utilities/ostream.cpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/utilities/ostream.cpp	Tue Apr 12 09:08:48 2016 +0000
@@ -31,7 +31,6 @@
 #include "utilities/defaultStream.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/ostream.hpp"
-#include "utilities/top.hpp"
 #include "utilities/xmlstream.hpp"
 
 extern "C" void jio_print(const char* s); // Declarationtion of jvm method
--- a/src/share/vm/utilities/pair.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/utilities/pair.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -26,7 +26,6 @@
 #define SHARE_VM_UTILITIES_PAIR_HPP
 
 #include "memory/allocation.hpp"
-#include "utilities/top.hpp"
 
 template<typename T, typename V,  typename ALLOC_BASE = ResourceObj>
 class Pair : public ALLOC_BASE {
--- a/src/share/vm/utilities/resourceHash.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/utilities/resourceHash.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -26,7 +26,6 @@
 #define SHARE_VM_UTILITIES_RESOURCEHASH_HPP
 
 #include "memory/allocation.hpp"
-#include "utilities/top.hpp"
 
 template<typename K> struct ResourceHashtableFns {
     typedef unsigned (*hash_fn)(K const&);
--- a/src/share/vm/utilities/top.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_VM_UTILITIES_TOP_HPP
-#define SHARE_VM_UTILITIES_TOP_HPP
-
-#include "oops/oopsHierarchy.hpp"
-#include "runtime/globals.hpp"
-#include "utilities/debug.hpp"
-#include "utilities/exceptions.hpp"
-#include "utilities/globalDefinitions.hpp"
-#include "utilities/macros.hpp"
-#include "utilities/ostream.hpp"
-#include "utilities/sizes.hpp"
-#if INCLUDE_ALL_GCS
-#include "gc/g1/g1_globals.hpp"
-#endif // INCLUDE_ALL_GCS
-#ifdef COMPILER1
-#include "c1/c1_globals.hpp"
-#endif
-#ifdef COMPILER2
-#include "opto/c2_globals.hpp"
-#endif
-#if INCLUDE_JVMCI
-#include "jvmci/jvmci_globals.hpp"
-#endif
-
-// THIS FILE IS INTESIONALLY LEFT EMPTY
-// IT IS USED TO MINIMIZE THE NUMBER OF DEPENDENCIES IN includeDB
-
-#endif // SHARE_VM_UTILITIES_TOP_HPP
--- a/src/share/vm/utilities/utf8.hpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/utilities/utf8.hpp	Tue Apr 12 09:08:48 2016 +0000
@@ -26,7 +26,6 @@
 #define SHARE_VM_UTILITIES_UTF8_HPP
 
 #include "memory/allocation.hpp"
-#include "utilities/top.hpp"
 
 // Low-level interface for UTF8 strings
 
--- a/src/share/vm/utilities/vmError.cpp	Mon Apr 11 12:22:09 2016 +0200
+++ b/src/share/vm/utilities/vmError.cpp	Tue Apr 12 09:08:48 2016 +0000
@@ -43,7 +43,6 @@
 #include "utilities/defaultStream.hpp"
 #include "utilities/errorReporter.hpp"
 #include "utilities/events.hpp"
-#include "utilities/top.hpp"
 #include "utilities/vmError.hpp"
 
 // List of environment variables that should be reported in error log file.