changeset 50984:bec342339138

8204195: Clean up macroAssembler.inline.hpp and other inline.hpp files included in .hpp files Summary: Moved macroAssembler.inline.hpp out of header file and distributed to .cpp files that included them: ie. c1_MacroAssembler.hpp and interp_masm.hpp. Also freeList.inline.hpp and allocation.inline.hpp. Reviewed-by: jiangli, kvn
author coleenp
date Mon, 04 Jun 2018 10:18:43 -0400
parents 1d476feca3c9
children 55eaaf4e2108
files src/hotspot/cpu/aarch64/c1_CodeStubs_aarch64.cpp src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp src/hotspot/cpu/aarch64/interpreterRT_aarch64.cpp src/hotspot/cpu/aarch64/register_definitions_aarch64.cpp src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp src/hotspot/cpu/aarch64/templateTable_aarch64.cpp src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp src/hotspot/cpu/arm/c1_CodeStubs_arm.cpp src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp src/hotspot/cpu/arm/c1_Runtime1_arm.cpp src/hotspot/cpu/arm/interp_masm_arm.cpp src/hotspot/cpu/arm/interp_masm_arm.hpp src/hotspot/cpu/arm/interpreterRT_arm.cpp src/hotspot/cpu/arm/templateInterpreterGenerator_arm.cpp src/hotspot/cpu/arm/templateTable_arm.cpp src/hotspot/cpu/arm/vtableStubs_arm.cpp src/hotspot/cpu/ppc/c1_CodeStubs_ppc.cpp src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp src/hotspot/cpu/s390/c1_CodeStubs_s390.cpp src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp src/hotspot/cpu/s390/c1_Runtime1_s390.cpp src/hotspot/cpu/sparc/c1_CodeStubs_sparc.cpp src/hotspot/cpu/sparc/c1_LIRAssembler_sparc.cpp src/hotspot/cpu/sparc/c1_LIRGenerator_sparc.cpp src/hotspot/cpu/sparc/c1_MacroAssembler_sparc.cpp src/hotspot/cpu/sparc/c1_Runtime1_sparc.cpp src/hotspot/cpu/sparc/gc/shared/barrierSetAssembler_sparc.cpp src/hotspot/cpu/sparc/interp_masm_sparc.cpp src/hotspot/cpu/sparc/interp_masm_sparc.hpp src/hotspot/cpu/sparc/macroAssembler_sparc.cpp src/hotspot/cpu/sparc/macroAssembler_sparc.hpp src/hotspot/cpu/sparc/macroAssembler_sparc.inline.hpp src/hotspot/cpu/sparc/memset_with_concurrent_readers_sparc.cpp src/hotspot/cpu/sparc/methodHandles_sparc.cpp src/hotspot/cpu/sparc/relocInfo_sparc.cpp src/hotspot/cpu/sparc/templateInterpreterGenerator_sparc.cpp src/hotspot/cpu/sparc/templateTable_sparc.cpp src/hotspot/cpu/x86/interp_masm_x86.hpp src/hotspot/cpu/zero/interp_masm_zero.hpp src/hotspot/cpu/zero/relocInfo_zero.cpp src/hotspot/cpu/zero/vtableStubs_zero.cpp src/hotspot/share/c1/c1_LIRAssembler.cpp src/hotspot/share/c1/c1_MacroAssembler.hpp src/hotspot/share/memory/metaspace.cpp src/hotspot/share/memory/metaspace/chunkManager.cpp src/hotspot/share/memory/metaspace/chunkManager.hpp src/hotspot/share/runtime/os_perf.hpp
diffstat 53 files changed, 73 insertions(+), 55 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotspot/cpu/aarch64/c1_CodeStubs_aarch64.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/aarch64/c1_CodeStubs_aarch64.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -24,6 +24,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_CodeStubs.hpp"
 #include "c1/c1_FrameMap.hpp"
 #include "c1/c1_LIRAssembler.hpp"
--- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -24,6 +24,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "asm/assembler.hpp"
 #include "c1/c1_CodeStubs.hpp"
 #include "c1/c1_Compilation.hpp"
--- a/src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -24,6 +24,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_Compilation.hpp"
 #include "c1/c1_FrameMap.hpp"
 #include "c1/c1_Instruction.hpp"
--- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -24,6 +24,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "interp_masm_aarch64.hpp"
--- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp	Mon Jun 04 10:18:43 2018 -0400
@@ -27,7 +27,6 @@
 #define CPU_AARCH64_VM_INTERP_MASM_AARCH64_64_HPP
 
 #include "asm/macroAssembler.hpp"
-#include "asm/macroAssembler.inline.hpp"
 #include "interpreter/invocationCounter.hpp"
 #include "runtime/frame.hpp"
 
--- a/src/hotspot/cpu/aarch64/interpreterRT_aarch64.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/aarch64/interpreterRT_aarch64.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -24,6 +24,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "interpreter/interp_masm.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
--- a/src/hotspot/cpu/aarch64/register_definitions_aarch64.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/aarch64/register_definitions_aarch64.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -25,6 +25,7 @@
 
 #include "precompiled.hpp"
 #include "asm/assembler.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "asm/register.hpp"
 #include "register_aarch64.hpp"
 # include "interp_masm_aarch64.hpp"
--- a/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -24,7 +24,7 @@
  */
 
 #include "precompiled.hpp"
-#include "asm/macroAssembler.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "interpreter/bytecodeHistogram.hpp"
 #include "interpreter/interpreter.hpp"
--- a/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -24,7 +24,7 @@
  */
 
 #include "precompiled.hpp"
-#include "asm/macroAssembler.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
--- a/src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -24,7 +24,7 @@
  */
 
 #include "precompiled.hpp"
-#include "asm/macroAssembler.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "assembler_aarch64.inline.hpp"
 #include "code/vtableStubs.hpp"
 #include "interp_masm_aarch64.hpp"
--- a/src/hotspot/cpu/arm/c1_CodeStubs_arm.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/arm/c1_CodeStubs_arm.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -23,7 +23,7 @@
  */
 
 #include "precompiled.hpp"
-#include "asm/macroAssembler.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_CodeStubs.hpp"
 #include "c1/c1_FrameMap.hpp"
 #include "c1/c1_LIRAssembler.hpp"
--- a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_Compilation.hpp"
 #include "c1/c1_LIRAssembler.hpp"
 #include "c1/c1_MacroAssembler.hpp"
--- a/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_Compilation.hpp"
 #include "c1/c1_FrameMap.hpp"
 #include "c1/c1_Instruction.hpp"
--- a/src/hotspot/cpu/arm/c1_Runtime1_arm.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/arm/c1_Runtime1_arm.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -23,7 +23,7 @@
  */
 
 #include "precompiled.hpp"
-#include "asm/macroAssembler.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_Defs.hpp"
 #include "c1/c1_LIRAssembler.hpp"
 #include "c1/c1_MacroAssembler.hpp"
--- a/src/hotspot/cpu/arm/interp_masm_arm.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/arm/interp_masm_arm.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "jvm.h"
+#include "asm/macroAssembler.inline.hpp"
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/cardTableBarrierSet.inline.hpp"
--- a/src/hotspot/cpu/arm/interp_masm_arm.hpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/arm/interp_masm_arm.hpp	Mon Jun 04 10:18:43 2018 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, 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
@@ -26,7 +26,6 @@
 #define CPU_ARM_VM_INTERP_MASM_ARM_HPP
 
 #include "asm/macroAssembler.hpp"
-#include "asm/macroAssembler.inline.hpp"
 #include "interpreter/invocationCounter.hpp"
 #include "runtime/frame.hpp"
 #include "prims/jvmtiExport.hpp"
--- a/src/hotspot/cpu/arm/interpreterRT_arm.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/arm/interpreterRT_arm.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "interpreter/interp_masm.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
--- a/src/hotspot/cpu/arm/templateInterpreterGenerator_arm.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/arm/templateInterpreterGenerator_arm.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "asm/assembler.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "interpreter/bytecodeHistogram.hpp"
 #include "interpreter/interp_masm.hpp"
 #include "interpreter/interpreter.hpp"
--- a/src/hotspot/cpu/arm/templateTable_arm.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/arm/templateTable_arm.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -23,7 +23,7 @@
  */
 
 #include "precompiled.hpp"
-#include "asm/macroAssembler.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "interpreter/interp_masm.hpp"
 #include "interpreter/interpreter.hpp"
--- a/src/hotspot/cpu/arm/vtableStubs_arm.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/arm/vtableStubs_arm.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, 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
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "asm/assembler.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "assembler_arm.inline.hpp"
 #include "code/vtableStubs.hpp"
 #include "interp_masm_arm.hpp"
--- a/src/hotspot/cpu/ppc/c1_CodeStubs_ppc.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/ppc/c1_CodeStubs_ppc.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -24,6 +24,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_CodeStubs.hpp"
 #include "c1/c1_FrameMap.hpp"
 #include "c1/c1_LIRAssembler.hpp"
--- a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -24,6 +24,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_Compilation.hpp"
 #include "c1/c1_LIRAssembler.hpp"
 #include "c1/c1_MacroAssembler.hpp"
--- a/src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -24,6 +24,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_Compilation.hpp"
 #include "c1/c1_FrameMap.hpp"
 #include "c1/c1_Instruction.hpp"
--- a/src/hotspot/cpu/s390/c1_CodeStubs_s390.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/s390/c1_CodeStubs_s390.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -24,6 +24,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_CodeStubs.hpp"
 #include "c1/c1_FrameMap.hpp"
 #include "c1/c1_LIRAssembler.hpp"
--- a/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -24,6 +24,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_Compilation.hpp"
 #include "c1/c1_LIRAssembler.hpp"
 #include "c1/c1_MacroAssembler.hpp"
--- a/src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -24,6 +24,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_MacroAssembler.hpp"
 #include "c1/c1_Runtime1.hpp"
 #include "classfile/systemDictionary.hpp"
--- a/src/hotspot/cpu/s390/c1_Runtime1_s390.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/s390/c1_Runtime1_s390.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -24,6 +24,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_Defs.hpp"
 #include "c1/c1_MacroAssembler.hpp"
 #include "c1/c1_Runtime1.hpp"
--- a/src/hotspot/cpu/sparc/c1_CodeStubs_sparc.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/sparc/c1_CodeStubs_sparc.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_CodeStubs.hpp"
 #include "c1/c1_FrameMap.hpp"
 #include "c1/c1_LIRAssembler.hpp"
--- a/src/hotspot/cpu/sparc/c1_LIRAssembler_sparc.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/sparc/c1_LIRAssembler_sparc.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_Compilation.hpp"
 #include "c1/c1_LIRAssembler.hpp"
 #include "c1/c1_MacroAssembler.hpp"
--- a/src/hotspot/cpu/sparc/c1_LIRGenerator_sparc.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/sparc/c1_LIRGenerator_sparc.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_Compilation.hpp"
 #include "c1/c1_FrameMap.hpp"
 #include "c1/c1_Instruction.hpp"
--- a/src/hotspot/cpu/sparc/c1_MacroAssembler_sparc.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/sparc/c1_MacroAssembler_sparc.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_MacroAssembler.hpp"
 #include "c1/c1_Runtime1.hpp"
 #include "classfile/systemDictionary.hpp"
--- a/src/hotspot/cpu/sparc/c1_Runtime1_sparc.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/sparc/c1_Runtime1_sparc.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_Defs.hpp"
 #include "c1/c1_MacroAssembler.hpp"
 #include "c1/c1_Runtime1.hpp"
--- a/src/hotspot/cpu/sparc/gc/shared/barrierSetAssembler_sparc.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/sparc/gc/shared/barrierSetAssembler_sparc.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "interpreter/interp_masm.hpp"
 #include "runtime/jniHandles.hpp"
--- a/src/hotspot/cpu/sparc/interp_masm_sparc.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/sparc/interp_masm_sparc.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "interp_masm_sparc.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
--- a/src/hotspot/cpu/sparc/interp_masm_sparc.hpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/sparc/interp_masm_sparc.hpp	Mon Jun 04 10:18:43 2018 -0400
@@ -25,7 +25,7 @@
 #ifndef CPU_SPARC_VM_INTERP_MASM_SPARC_HPP
 #define CPU_SPARC_VM_INTERP_MASM_SPARC_HPP
 
-#include "asm/macroAssembler.inline.hpp"
+#include "asm/macroAssembler.hpp"
 #include "interpreter/invocationCounter.hpp"
 
 // This file specializes the assember with interpreter-specific macros
--- a/src/hotspot/cpu/sparc/macroAssembler_sparc.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/sparc/macroAssembler_sparc.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -3338,6 +3338,12 @@
   _masm->bind(_label);
 }
 
+void MacroAssembler::bang_stack_with_offset(int offset) {
+  // stack grows down, caller passes positive offset
+  assert(offset > 0, "must bang with negative offset");
+  set((-offset)+STACK_BIAS, G3_scratch);
+  st(G0, SP, G3_scratch);
+}
 
 // Writes to stack successive pages until offset reached to check for
 // stack overflow + shadow pages.  This clobbers tsp and scratch.
--- a/src/hotspot/cpu/sparc/macroAssembler_sparc.hpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/sparc/macroAssembler_sparc.hpp	Mon Jun 04 10:18:43 2018 -0400
@@ -1303,7 +1303,7 @@
   // Stack overflow checking
 
   // Note: this clobbers G3_scratch
-  inline void bang_stack_with_offset(int offset);
+  void bang_stack_with_offset(int offset);
 
   // Writes to stack successive pages until offset reached to check for
   // stack overflow + shadow pages.  Clobbers tsp and scratch registers.
--- a/src/hotspot/cpu/sparc/macroAssembler_sparc.inline.hpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/sparc/macroAssembler_sparc.inline.hpp	Mon Jun 04 10:18:43 2018 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -724,12 +724,4 @@
   if (a.has_index()) { assert(offset == 0, ""); swap(a.base(), a.index(), d        ); }
   else               {                          swap(a.base(), a.disp() + offset, d); }
 }
-
-inline void MacroAssembler::bang_stack_with_offset(int offset) {
-  // stack grows down, caller passes positive offset
-  assert(offset > 0, "must bang with negative offset");
-  set((-offset)+STACK_BIAS, G3_scratch);
-  st(G0, SP, G3_scratch);
-}
-
 #endif // CPU_SPARC_VM_MACROASSEMBLER_SPARC_INLINE_HPP
--- a/src/hotspot/cpu/sparc/memset_with_concurrent_readers_sparc.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/sparc/memset_with_concurrent_readers_sparc.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 
+#include "asm/macroAssembler.inline.hpp"
 #include "gc/shared/memset_with_concurrent_readers.hpp"
 #include "runtime/prefetch.inline.hpp"
 #include "utilities/align.hpp"
--- a/src/hotspot/cpu/sparc/methodHandles_sparc.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/sparc/methodHandles_sparc.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -24,7 +24,7 @@
 
 #include "precompiled.hpp"
 #include "jvm.h"
-#include "asm/macroAssembler.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "classfile/javaClasses.inline.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interp_masm.hpp"
--- a/src/hotspot/cpu/sparc/relocInfo_sparc.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/sparc/relocInfo_sparc.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -23,7 +23,7 @@
  */
 
 #include "precompiled.hpp"
-#include "asm/assembler.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "code/relocInfo.hpp"
 #include "nativeInst_sparc.hpp"
 #include "oops/compressedOops.inline.hpp"
--- a/src/hotspot/cpu/sparc/templateInterpreterGenerator_sparc.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/sparc/templateInterpreterGenerator_sparc.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -23,7 +23,7 @@
  */
 
 #include "precompiled.hpp"
-#include "asm/macroAssembler.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "interpreter/bytecodeHistogram.hpp"
 #include "interpreter/interpreter.hpp"
--- a/src/hotspot/cpu/sparc/templateTable_sparc.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/sparc/templateTable_sparc.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
--- a/src/hotspot/cpu/x86/interp_masm_x86.hpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/x86/interp_masm_x86.hpp	Mon Jun 04 10:18:43 2018 -0400
@@ -26,7 +26,6 @@
 #define CPU_X86_VM_INTERP_MASM_X86_HPP
 
 #include "asm/macroAssembler.hpp"
-#include "asm/macroAssembler.inline.hpp"
 #include "interpreter/invocationCounter.hpp"
 #include "runtime/frame.hpp"
 
--- a/src/hotspot/cpu/zero/interp_masm_zero.hpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/zero/interp_masm_zero.hpp	Mon Jun 04 10:18:43 2018 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -26,7 +26,8 @@
 #ifndef CPU_ZERO_VM_INTERP_MASM_ZERO_HPP
 #define CPU_ZERO_VM_INTERP_MASM_ZERO_HPP
 
-#include "assembler_zero.inline.hpp"
+#include "asm/codeBuffer.hpp"
+#include "asm/macroAssembler.hpp"
 #include "interpreter/invocationCounter.hpp"
 
 // This file specializes the assember with interpreter-specific macros
--- a/src/hotspot/cpu/zero/relocInfo_zero.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/zero/relocInfo_zero.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2009, 2010, 2011 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -24,8 +24,7 @@
  */
 
 #include "precompiled.hpp"
-#include "asm/assembler.inline.hpp"
-#include "assembler_zero.inline.hpp"
+#include "asm/codeBuffer.hpp"
 #include "code/relocInfo.hpp"
 #include "nativeInst_zero.hpp"
 #include "oops/oop.inline.hpp"
--- a/src/hotspot/cpu/zero/vtableStubs_zero.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/cpu/zero/vtableStubs_zero.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -24,18 +24,8 @@
  */
 
 #include "precompiled.hpp"
-#include "asm/assembler.hpp"
-#include "assembler_zero.inline.hpp"
 #include "code/vtableStubs.hpp"
-#include "interp_masm_zero.hpp"
-#include "memory/resourceArea.hpp"
-#include "oops/instanceKlass.hpp"
-#include "oops/klassVtable.hpp"
-#include "runtime/sharedRuntime.hpp"
-#include "vmreg_zero.inline.hpp"
-#ifdef COMPILER2
-#include "opto/runtime.hpp"
-#endif
+#include "utilities/debug.hpp"
 
 VtableStub* VtableStubs::create_vtable_stub(int vtable_index) {
   ShouldNotCallThis();
--- a/src/hotspot/share/c1/c1_LIRAssembler.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/share/c1/c1_LIRAssembler.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "asm/assembler.inline.hpp"
 #include "c1/c1_Compilation.hpp"
 #include "c1/c1_Instruction.hpp"
 #include "c1/c1_InstructionPrinter.hpp"
--- a/src/hotspot/share/c1/c1_MacroAssembler.hpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/share/c1/c1_MacroAssembler.hpp	Mon Jun 04 10:18:43 2018 -0400
@@ -26,7 +26,6 @@
 #define SHARE_VM_C1_C1_MACROASSEMBLER_HPP
 
 #include "asm/macroAssembler.hpp"
-#include "asm/macroAssembler.inline.hpp"
 #include "utilities/macros.hpp"
 
 class CodeEmitInfo;
--- a/src/hotspot/share/memory/metaspace.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/share/memory/metaspace.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 
 #include "aot/aotLoader.hpp"
+#include "gc/shared/collectedHeap.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/filemap.hpp"
@@ -37,11 +38,13 @@
 #include "memory/metaspace/virtualSpaceList.hpp"
 #include "memory/metaspaceShared.hpp"
 #include "memory/metaspaceTracer.hpp"
+#include "memory/universe.hpp"
 #include "runtime/init.hpp"
 #include "runtime/orderAccess.inline.hpp"
 #include "services/memTracker.hpp"
 #include "utilities/copy.hpp"
 #include "utilities/debug.hpp"
+#include "utilities/formatBuffer.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 
--- a/src/hotspot/share/memory/metaspace/chunkManager.cpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/share/memory/metaspace/chunkManager.cpp	Mon Jun 04 10:18:43 2018 -0400
@@ -40,6 +40,13 @@
 
 namespace metaspace {
 
+ChunkManager::ChunkManager(bool is_class)
+      : _is_class(is_class), _free_chunks_total(0), _free_chunks_count(0) {
+  _free_chunks[SpecializedIndex].set_size(get_size_for_nonhumongous_chunktype(SpecializedIndex, is_class));
+  _free_chunks[SmallIndex].set_size(get_size_for_nonhumongous_chunktype(SmallIndex, is_class));
+  _free_chunks[MediumIndex].set_size(get_size_for_nonhumongous_chunktype(MediumIndex, is_class));
+}
+
 void ChunkManager::remove_chunk(Metachunk* chunk) {
   size_t word_size = chunk->word_size();
   ChunkIndex index = list_index(word_size);
--- a/src/hotspot/share/memory/metaspace/chunkManager.hpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/share/memory/metaspace/chunkManager.hpp	Mon Jun 04 10:18:43 2018 -0400
@@ -27,7 +27,7 @@
 
 #include "memory/allocation.hpp"
 #include "memory/binaryTreeDictionary.hpp"
-#include "memory/freeList.inline.hpp"
+#include "memory/freeList.hpp"
 #include "memory/metaspace/metachunk.hpp"
 #include "memory/metaspace/metaspaceStatistics.hpp"
 #include "memory/metaspaceChunkFreeListSummary.hpp"
@@ -115,12 +115,7 @@
 
  public:
 
-  ChunkManager(bool is_class)
-      : _is_class(is_class), _free_chunks_total(0), _free_chunks_count(0) {
-    _free_chunks[SpecializedIndex].set_size(get_size_for_nonhumongous_chunktype(SpecializedIndex, is_class));
-    _free_chunks[SmallIndex].set_size(get_size_for_nonhumongous_chunktype(SmallIndex, is_class));
-    _free_chunks[MediumIndex].set_size(get_size_for_nonhumongous_chunktype(MediumIndex, is_class));
-  }
+  ChunkManager(bool is_class);
 
   // Add or delete (return) a chunk to the global freelist.
   Metachunk* chunk_freelist_allocate(size_t word_size);
--- a/src/hotspot/share/runtime/os_perf.hpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/share/runtime/os_perf.hpp	Mon Jun 04 10:18:43 2018 -0400
@@ -26,7 +26,7 @@
 #define SHARE_VM_RUNTIME_OS_PERF_HPP
 
 #include "utilities/macros.hpp"
-#include "memory/allocation.inline.hpp"
+#include "memory/allocation.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 #define FUNCTIONALITY_NOT_IMPLEMENTED -8