--- old/src/cpu/aarch64/vm/abstractInterpreter_aarch64.cpp	2017-07-04 23:39:00.757264191 +0200
+++ new/src/cpu/aarch64/vm/abstractInterpreter_aarch64.cpp	2017-07-04 23:39:00.593258831 +0200
@@ -28,6 +28,7 @@
 #include "oops/constMethod.hpp"
 #include "oops/method.hpp"
 #include "runtime/frame.inline.hpp"
+#include "utilities/align.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/macros.hpp"
 
--- old/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp	2017-07-04 23:39:01.001272167 +0200
+++ new/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp	2017-07-04 23:39:00.853267329 +0200
@@ -36,6 +36,7 @@
 #include "oops/compiledICHolder.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/vframeArray.hpp"
+#include "utilities/align.hpp"
 #include "vmreg_aarch64.inline.hpp"
 #ifdef COMPILER1
 #include "c1/c1_Runtime1.hpp"
--- old/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp	2017-07-04 23:39:01.273281057 +0200
+++ new/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp	2017-07-04 23:39:01.129276350 +0200
@@ -39,6 +39,7 @@
 #include "runtime/stubCodeGenerator.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "runtime/thread.inline.hpp"
+#include "utilities/align.hpp"
 #ifdef COMPILER2
 #include "opto/runtime.hpp"
 #endif
--- old/src/cpu/arm/vm/abstractInterpreter_arm.cpp	2017-07-04 23:39:01.589291386 +0200
+++ new/src/cpu/arm/vm/abstractInterpreter_arm.cpp	2017-07-04 23:39:01.425286025 +0200
@@ -32,6 +32,7 @@
 #include "runtime/handles.inline.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/synchronizer.hpp"
+#include "utilities/align.hpp"
 #include "utilities/macros.hpp"
 
 int AbstractInterpreter::BasicType_as_index(BasicType type) {
--- old/src/cpu/arm/vm/c1_Runtime1_arm.cpp	2017-07-04 23:39:01.825299099 +0200
+++ new/src/cpu/arm/vm/c1_Runtime1_arm.cpp	2017-07-04 23:39:01.681294393 +0200
@@ -37,6 +37,7 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/signature.hpp"
 #include "runtime/vframeArray.hpp"
+#include "utilities/align.hpp"
 #include "vmreg_arm.inline.hpp"
 #if INCLUDE_ALL_GCS
 #include "gc/g1/g1SATBCardTableModRefBS.hpp"
--- old/src/cpu/arm/vm/sharedRuntime_arm.cpp	2017-07-04 23:39:02.069307075 +0200
+++ new/src/cpu/arm/vm/sharedRuntime_arm.cpp	2017-07-04 23:39:01.933302629 +0200
@@ -34,6 +34,7 @@
 #include "oops/compiledICHolder.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/vframeArray.hpp"
+#include "utilities/align.hpp"
 #include "vmreg_arm.inline.hpp"
 #ifdef COMPILER1
 #include "c1/c1_Runtime1.hpp"
--- old/src/cpu/arm/vm/stubGenerator_arm.cpp	2017-07-04 23:39:02.353316357 +0200
+++ new/src/cpu/arm/vm/stubGenerator_arm.cpp	2017-07-04 23:39:02.193311128 +0200
@@ -37,6 +37,7 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubCodeGenerator.hpp"
 #include "runtime/stubRoutines.hpp"
+#include "utilities/align.hpp"
 #ifdef COMPILER2
 #include "opto/runtime.hpp"
 #endif
--- old/src/cpu/arm/vm/templateInterpreterGenerator_arm.cpp	2017-07-04 23:39:02.657326294 +0200
+++ new/src/cpu/arm/vm/templateInterpreterGenerator_arm.cpp	2017-07-04 23:39:02.501321195 +0200
@@ -45,6 +45,7 @@
 #include "runtime/synchronizer.hpp"
 #include "runtime/timer.hpp"
 #include "runtime/vframeArray.hpp"
+#include "utilities/align.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/macros.hpp"
 
--- old/src/cpu/ppc/vm/c1_MacroAssembler_ppc.cpp	2017-07-04 23:39:02.933335316 +0200
+++ new/src/cpu/ppc/vm/c1_MacroAssembler_ppc.cpp	2017-07-04 23:39:02.789330609 +0200
@@ -36,6 +36,7 @@
 #include "runtime/os.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "runtime/sharedRuntime.hpp"
+#include "utilities/align.hpp"
 
 
 void C1_MacroAssembler::inline_cache_check(Register receiver, Register iCache) {
--- old/src/cpu/ppc/vm/c1_Runtime1_ppc.cpp	2017-07-04 23:39:03.181343421 +0200
+++ new/src/cpu/ppc/vm/c1_Runtime1_ppc.cpp	2017-07-04 23:39:03.037338714 +0200
@@ -36,6 +36,7 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/signature.hpp"
 #include "runtime/vframeArray.hpp"
+#include "utilities/align.hpp"
 #include "utilities/macros.hpp"
 #include "vmreg_ppc.inline.hpp"
 #if INCLUDE_ALL_GCS
--- old/src/cpu/ppc/vm/frame_ppc.inline.hpp	2017-07-04 23:39:03.417351135 +0200
+++ new/src/cpu/ppc/vm/frame_ppc.inline.hpp	2017-07-04 23:39:03.281346690 +0200
@@ -28,6 +28,7 @@
 
 #include "code/codeCache.hpp"
 #include "code/vmreg.inline.hpp"
+#include "utilities/align.hpp"
 
 // Inline functions for ppc64 frames:
 
--- old/src/cpu/ppc/vm/sharedRuntime_ppc.cpp	2017-07-04 23:39:03.653358849 +0200
+++ new/src/cpu/ppc/vm/sharedRuntime_ppc.cpp	2017-07-04 23:39:03.505354011 +0200
@@ -35,6 +35,7 @@
 #include "oops/compiledICHolder.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/vframeArray.hpp"
+#include "utilities/align.hpp"
 #include "vmreg_ppc.inline.hpp"
 #ifdef COMPILER1
 #include "c1/c1_Runtime1.hpp"
--- old/src/cpu/ppc/vm/stubGenerator_ppc.cpp	2017-07-04 23:39:03.913367347 +0200
+++ new/src/cpu/ppc/vm/stubGenerator_ppc.cpp	2017-07-04 23:39:03.781363033 +0200
@@ -38,6 +38,7 @@
 #include "runtime/stubCodeGenerator.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "runtime/thread.inline.hpp"
+#include "utilities/align.hpp"
 
 #define __ _masm->
 
--- old/src/cpu/ppc/vm/vm_version_ppc.cpp	2017-07-04 23:39:04.185376238 +0200
+++ new/src/cpu/ppc/vm/vm_version_ppc.cpp	2017-07-04 23:39:04.045371662 +0200
@@ -32,6 +32,7 @@
 #include "runtime/java.hpp"
 #include "runtime/os.hpp"
 #include "runtime/stubCodeGenerator.hpp"
+#include "utilities/align.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "vm_version_ppc.hpp"
--- old/src/cpu/s390/vm/c1_CodeStubs_s390.cpp	2017-07-04 23:39:04.429384213 +0200
+++ new/src/cpu/s390/vm/c1_CodeStubs_s390.cpp	2017-07-04 23:39:04.285379506 +0200
@@ -31,6 +31,7 @@
 #include "c1/c1_Runtime1.hpp"
 #include "nativeInst_s390.hpp"
 #include "runtime/sharedRuntime.hpp"
+#include "utilities/align.hpp"
 #include "utilities/macros.hpp"
 #include "vmreg_s390.inline.hpp"
 #if INCLUDE_ALL_GCS
--- old/src/cpu/s390/vm/frame_s390.inline.hpp	2017-07-04 23:39:04.665391927 +0200
+++ new/src/cpu/s390/vm/frame_s390.inline.hpp	2017-07-04 23:39:04.525387351 +0200
@@ -28,6 +28,7 @@
 
 #include "code/codeCache.hpp"
 #include "code/vmreg.inline.hpp"
+#include "utilities/align.hpp"
 
 // Inline functions for z/Architecture frames:
 
--- old/src/cpu/s390/vm/sharedRuntime_s390.cpp	2017-07-04 23:39:04.881398987 +0200
+++ new/src/cpu/s390/vm/sharedRuntime_s390.cpp	2017-07-04 23:39:04.753394803 +0200
@@ -35,6 +35,7 @@
 #include "registerSaver_s390.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/vframeArray.hpp"
+#include "utilities/align.hpp"
 #include "vmreg_s390.inline.hpp"
 #ifdef COMPILER1
 #include "c1/c1_Runtime1.hpp"
--- old/src/cpu/sparc/vm/abstractInterpreter_sparc.cpp	2017-07-04 23:39:05.169408401 +0200
+++ new/src/cpu/sparc/vm/abstractInterpreter_sparc.cpp	2017-07-04 23:39:05.009403171 +0200
@@ -29,6 +29,7 @@
 #include "runtime/arguments.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/synchronizer.hpp"
+#include "utilities/align.hpp"
 #include "utilities/macros.hpp"
 
 
--- old/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp	2017-07-04 23:39:05.421416637 +0200
+++ new/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp	2017-07-04 23:39:05.269411669 +0200
@@ -35,6 +35,7 @@
 #include "runtime/signature.hpp"
 #include "runtime/vframeArray.hpp"
 #include "utilities/macros.hpp"
+#include "utilities/align.hpp"
 #include "vmreg_sparc.inline.hpp"
 #if INCLUDE_ALL_GCS
 #include "gc/g1/g1SATBCardTableModRefBS.hpp"
--- old/src/cpu/sparc/vm/frame_sparc.inline.hpp	2017-07-04 23:39:05.693425527 +0200
+++ new/src/cpu/sparc/vm/frame_sparc.inline.hpp	2017-07-04 23:39:05.529420167 +0200
@@ -27,6 +27,7 @@
 
 #include "asm/macroAssembler.hpp"
 #include "code/vmreg.inline.hpp"
+#include "utilities/align.hpp"
 
 // Inline functions for SPARC frames:
 
--- old/src/cpu/sparc/vm/interp_masm_sparc.cpp	2017-07-04 23:39:05.933433372 +0200
+++ new/src/cpu/sparc/vm/interp_masm_sparc.cpp	2017-07-04 23:39:05.789428665 +0200
@@ -38,6 +38,7 @@
 #include "runtime/biasedLocking.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/thread.inline.hpp"
+#include "utilities/align.hpp"
 
 // Implementation of InterpreterMacroAssembler
 
--- old/src/cpu/sparc/vm/jvmciCodeInstaller_sparc.cpp	2017-07-04 23:39:06.137440040 +0200
+++ new/src/cpu/sparc/vm/jvmciCodeInstaller_sparc.cpp	2017-07-04 23:39:06.017436118 +0200
@@ -27,6 +27,7 @@
 #include "jvmci/jvmciJavaClasses.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/sharedRuntime.hpp"
+#include "utilities/align.hpp"
 #include "vmreg_sparc.inline.hpp"
 
 jint CodeInstaller::pd_next_offset(NativeInstruction* inst, jint pc_offset, Handle method, TRAPS) {
--- old/src/cpu/sparc/vm/macroAssembler_sparc.cpp	2017-07-04 23:39:06.373447754 +0200
+++ new/src/cpu/sparc/vm/macroAssembler_sparc.cpp	2017-07-04 23:39:06.229443047 +0200
@@ -39,6 +39,7 @@
 #include "runtime/os.inline.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"
+#include "utilities/align.hpp"
 #include "utilities/macros.hpp"
 #if INCLUDE_ALL_GCS
 #include "gc/g1/g1CollectedHeap.inline.hpp"
--- old/src/cpu/sparc/vm/memset_with_concurrent_readers_sparc.cpp	2017-07-04 23:39:06.681457821 +0200
+++ new/src/cpu/sparc/vm/memset_with_concurrent_readers_sparc.cpp	2017-07-04 23:39:06.529452853 +0200
@@ -26,6 +26,7 @@
 
 #include "gc/shared/memset_with_concurrent_readers.hpp"
 #include "runtime/prefetch.inline.hpp"
+#include "utilities/align.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
--- old/src/cpu/sparc/vm/sharedRuntime_sparc.cpp	2017-07-04 23:39:06.929465927 +0200
+++ new/src/cpu/sparc/vm/sharedRuntime_sparc.cpp	2017-07-04 23:39:06.777460959 +0200
@@ -33,6 +33,7 @@
 #include "oops/compiledICHolder.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/vframeArray.hpp"
+#include "utilities/align.hpp"
 #include "vmreg_sparc.inline.hpp"
 #ifdef COMPILER1
 #include "c1/c1_Runtime1.hpp"
--- old/src/cpu/sparc/vm/templateInterpreterGenerator_sparc.cpp	2017-07-04 23:39:07.201474818 +0200
+++ new/src/cpu/sparc/vm/templateInterpreterGenerator_sparc.cpp	2017-07-04 23:39:07.065470373 +0200
@@ -44,6 +44,7 @@
 #include "runtime/synchronizer.hpp"
 #include "runtime/timer.hpp"
 #include "runtime/vframeArray.hpp"
+#include "utilities/align.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/macros.hpp"
 
--- old/src/cpu/x86/vm/bytes_x86.hpp	2017-07-04 23:39:07.473483708 +0200
+++ new/src/cpu/x86/vm/bytes_x86.hpp	2017-07-04 23:39:07.317478609 +0200
@@ -26,6 +26,7 @@
 #define CPU_X86_VM_BYTES_X86_HPP
 
 #include "memory/allocation.hpp"
+#include "utilities/align.hpp"
 #include "utilities/macros.hpp"
 
 class Bytes: AllStatic {
--- old/src/cpu/x86/vm/c1_CodeStubs_x86.cpp	2017-07-04 23:39:07.737492337 +0200
+++ new/src/cpu/x86/vm/c1_CodeStubs_x86.cpp	2017-07-04 23:39:07.581487238 +0200
@@ -30,6 +30,7 @@
 #include "c1/c1_Runtime1.hpp"
 #include "nativeInst_x86.hpp"
 #include "runtime/sharedRuntime.hpp"
+#include "utilities/align.hpp"
 #include "utilities/macros.hpp"
 #include "vmreg_x86.inline.hpp"
 #if INCLUDE_ALL_GCS
--- old/src/cpu/x86/vm/sharedRuntime_x86_32.cpp	2017-07-04 23:39:07.961499659 +0200
+++ new/src/cpu/x86/vm/sharedRuntime_x86_32.cpp	2017-07-04 23:39:07.833495475 +0200
@@ -34,6 +34,7 @@
 #include "oops/compiledICHolder.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/vframeArray.hpp"
+#include "utilities/align.hpp"
 #include "vmreg_x86.inline.hpp"
 #ifdef COMPILER1
 #include "c1/c1_Runtime1.hpp"
--- old/src/cpu/x86/vm/sharedRuntime_x86_64.cpp	2017-07-04 23:39:08.237508680 +0200
+++ new/src/cpu/x86/vm/sharedRuntime_x86_64.cpp	2017-07-04 23:39:08.093503973 +0200
@@ -37,6 +37,8 @@
 #include "oops/compiledICHolder.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/vframeArray.hpp"
+#include "utilities/align.hpp"
+#include "vm_version_x86.hpp"
 #include "vmreg_x86.inline.hpp"
 #ifdef COMPILER1
 #include "c1/c1_Runtime1.hpp"
@@ -47,7 +49,6 @@
 #if INCLUDE_JVMCI
 #include "jvmci/jvmciJavaClasses.hpp"
 #endif
-#include "vm_version_x86.hpp"
 
 #define __ masm->
 
--- old/src/cpu/zero/vm/interpreterFrame_zero.hpp	2017-07-04 23:39:08.541518616 +0200
+++ new/src/cpu/zero/vm/interpreterFrame_zero.hpp	2017-07-04 23:39:08.381513387 +0200
@@ -30,6 +30,7 @@
 #include "oops/method.hpp"
 #include "runtime/thread.hpp"
 #include "stack_zero.hpp"
+#include "utilities/align.hpp"
 
 #ifdef CC_INTERP
 // |  ...               |
--- old/src/cpu/zero/vm/interpreterRT_zero.cpp	2017-07-04 23:39:08.777526330 +0200
+++ new/src/cpu/zero/vm/interpreterRT_zero.cpp	2017-07-04 23:39:08.629521492 +0200
@@ -35,6 +35,7 @@
 #include "runtime/interfaceSupport.hpp"
 #include "runtime/signature.hpp"
 #include "stack_zero.inline.hpp"
+#include "utilities/align.hpp"
 
 void InterpreterRuntime::SignatureHandlerGeneratorBase::pass_int() {
   push(T_INT);
--- old/src/cpu/zero/vm/stack_zero.cpp	2017-07-04 23:39:09.021534305 +0200
+++ new/src/cpu/zero/vm/stack_zero.cpp	2017-07-04 23:39:08.877529599 +0200
@@ -28,6 +28,7 @@
 #include "runtime/thread.hpp"
 #include "stack_zero.hpp"
 #include "stack_zero.inline.hpp"
+#include "utilities/align.hpp"
 
 // Inlined causes circular inclusion with thread.hpp
 ZeroStack::ZeroStack()
--- old/src/cpu/zero/vm/stack_zero.hpp	2017-07-04 23:39:09.253541888 +0200
+++ new/src/cpu/zero/vm/stack_zero.hpp	2017-07-04 23:39:09.109537181 +0200
@@ -26,6 +26,7 @@
 #ifndef CPU_ZERO_VM_STACK_ZERO_HPP
 #define CPU_ZERO_VM_STACK_ZERO_HPP
 
+#include "utilities/align.hpp"
 #include "utilities/sizes.hpp"
 
 class ZeroStack {
--- old/src/os/aix/vm/misc_aix.cpp	2017-07-04 23:39:09.501549995 +0200
+++ new/src/os/aix/vm/misc_aix.cpp	2017-07-04 23:39:09.349545026 +0200
@@ -24,6 +24,7 @@
 
 #include "misc_aix.hpp"
 #include "runtime/stubRoutines.hpp"
+#include "utilities/align.hpp"
 
 #include <pthread.h>
 #include <unistd.h>
--- old/src/os/aix/vm/os_aix.cpp	2017-07-04 23:39:09.753558231 +0200
+++ new/src/os/aix/vm/os_aix.cpp	2017-07-04 23:39:09.593553001 +0200
@@ -73,6 +73,7 @@
 #include "runtime/vm_version.hpp"
 #include "services/attachListener.hpp"
 #include "services/runtimeService.hpp"
+#include "utilities/align.hpp"
 #include "utilities/decoder.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/events.hpp"
--- old/src/os/aix/vm/porting_aix.cpp	2017-07-04 23:39:10.053568037 +0200
+++ new/src/os/aix/vm/porting_aix.cpp	2017-07-04 23:39:09.897562938 +0200
@@ -31,6 +31,7 @@
 #include "porting_aix.hpp"
 #include "runtime/os.hpp"
 #include "runtime/thread.hpp"
+#include "utilities/align.hpp"
 #include "utilities/debug.hpp"
 
 #include <demangle.h>
--- old/src/os/bsd/vm/os_bsd.cpp	2017-07-04 23:39:10.321576797 +0200
+++ new/src/os/bsd/vm/os_bsd.cpp	2017-07-04 23:39:10.161571566 +0200
@@ -63,6 +63,7 @@
 #include "services/attachListener.hpp"
 #include "services/memTracker.hpp"
 #include "services/runtimeService.hpp"
+#include "utilities/align.hpp"
 #include "utilities/decoder.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/events.hpp"
--- old/src/os/linux/vm/os_linux.cpp	2017-07-04 23:39:10.605586079 +0200
+++ new/src/os/linux/vm/os_linux.cpp	2017-07-04 23:39:10.449580980 +0200
@@ -64,6 +64,7 @@
 #include "services/attachListener.hpp"
 #include "services/memTracker.hpp"
 #include "services/runtimeService.hpp"
+#include "utilities/align.hpp"
 #include "utilities/decoder.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/events.hpp"
--- old/src/os/posix/vm/os_posix.cpp	2017-07-04 23:39:10.929596669 +0200
+++ new/src/os/posix/vm/os_posix.cpp	2017-07-04 23:39:10.769591440 +0200
@@ -28,6 +28,7 @@
 #include "runtime/frame.inline.hpp"
 #include "runtime/interfaceSupport.hpp"
 #include "runtime/os.hpp"
+#include "utilities/align.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/vmError.hpp"
 
--- old/src/os/solaris/vm/os_solaris.cpp	2017-07-04 23:39:11.193605298 +0200
+++ new/src/os/solaris/vm/os_solaris.cpp	2017-07-04 23:39:11.041600330 +0200
@@ -64,6 +64,7 @@
 #include "services/attachListener.hpp"
 #include "services/memTracker.hpp"
 #include "services/runtimeService.hpp"
+#include "utilities/align.hpp"
 #include "utilities/decoder.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/events.hpp"
--- old/src/os/windows/vm/os_windows.cpp	2017-07-04 23:39:11.541616673 +0200
+++ new/src/os/windows/vm/os_windows.cpp	2017-07-04 23:39:11.365610920 +0200
@@ -67,6 +67,7 @@
 #include "services/attachListener.hpp"
 #include "services/memTracker.hpp"
 #include "services/runtimeService.hpp"
+#include "utilities/align.hpp"
 #include "utilities/decoder.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/events.hpp"
--- old/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	2017-07-04 23:39:11.873627524 +0200
+++ new/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	2017-07-04 23:39:11.713622295 +0200
@@ -49,6 +49,7 @@
 #include "runtime/stubRoutines.hpp"
 #include "runtime/thread.inline.hpp"
 #include "runtime/timer.hpp"
+#include "utilities/align.hpp"
 #include "utilities/events.hpp"
 #include "utilities/vmError.hpp"
 
--- old/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	2017-07-04 23:39:12.133636023 +0200
+++ new/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	2017-07-04 23:39:11.985631185 +0200
@@ -50,6 +50,7 @@
 #include "runtime/thread.inline.hpp"
 #include "runtime/timer.hpp"
 #include "services/memTracker.hpp"
+#include "utilities/align.hpp"
 #include "utilities/events.hpp"
 #include "utilities/vmError.hpp"
 
--- old/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	2017-07-04 23:39:12.405644913 +0200
+++ new/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	2017-07-04 23:39:12.237639421 +0200
@@ -50,6 +50,7 @@
 #include "runtime/stubRoutines.hpp"
 #include "runtime/thread.inline.hpp"
 #include "runtime/timer.hpp"
+#include "utilities/align.hpp"
 #include "utilities/events.hpp"
 #include "utilities/vmError.hpp"
 
--- old/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp	2017-07-04 23:39:12.661653281 +0200
+++ new/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp	2017-07-04 23:39:12.513648443 +0200
@@ -50,6 +50,7 @@
 #include "runtime/stubRoutines.hpp"
 #include "runtime/thread.inline.hpp"
 #include "runtime/timer.hpp"
+#include "utilities/align.hpp"
 #include "utilities/events.hpp"
 #include "utilities/vmError.hpp"
 
--- old/src/share/vm/asm/codeBuffer.cpp	2017-07-04 23:39:12.917661648 +0200
+++ new/src/share/vm/asm/codeBuffer.cpp	2017-07-04 23:39:12.757656418 +0200
@@ -29,6 +29,7 @@
 #include "oops/methodData.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/icache.hpp"
+#include "utilities/align.hpp"
 #include "utilities/copy.hpp"
 #include "utilities/xmlstream.hpp"
 
--- old/src/share/vm/asm/codeBuffer.hpp	2017-07-04 23:39:13.141668969 +0200
+++ new/src/share/vm/asm/codeBuffer.hpp	2017-07-04 23:39:13.009664655 +0200
@@ -27,6 +27,7 @@
 
 #include "code/oopRecorder.hpp"
 #include "code/relocInfo.hpp"
+#include "utilities/align.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/macros.hpp"
 
--- old/src/share/vm/c1/c1_FrameMap.cpp	2017-07-04 23:39:13.389677075 +0200
+++ new/src/share/vm/c1/c1_FrameMap.cpp	2017-07-04 23:39:13.241672238 +0200
@@ -27,6 +27,7 @@
 #include "c1/c1_LIR.hpp"
 #include "code/vmreg.inline.hpp"
 #include "runtime/sharedRuntime.hpp"
+#include "utilities/align.hpp"
 
 //-----------------------------------------------------
 
--- old/src/share/vm/c1/c1_LinearScan.hpp	2017-07-04 23:39:13.617684528 +0200
+++ new/src/share/vm/c1/c1_LinearScan.hpp	2017-07-04 23:39:13.485680213 +0200
@@ -31,6 +31,7 @@
 #include "c1/c1_Instruction.hpp"
 #include "c1/c1_LIR.hpp"
 #include "c1/c1_LIRGenerator.hpp"
+#include "utilities/align.hpp"
 #include "utilities/macros.hpp"
 
 class DebugInfoCache;
--- old/src/share/vm/ci/bcEscapeAnalyzer.cpp	2017-07-04 23:39:13.869692765 +0200
+++ new/src/share/vm/ci/bcEscapeAnalyzer.cpp	2017-07-04 23:39:13.709687534 +0200
@@ -30,6 +30,7 @@
 #include "ci/ciStreams.hpp"
 #include "interpreter/bytecode.hpp"
 #include "oops/oop.inline.hpp"
+#include "utilities/align.hpp"
 #include "utilities/bitMap.inline.hpp"
 
 
--- old/src/share/vm/classfile/classFileParser.cpp	2017-07-04 23:39:14.141701655 +0200
+++ new/src/share/vm/classfile/classFileParser.cpp	2017-07-04 23:39:13.977696294 +0200
@@ -64,6 +64,7 @@
 #include "services/classLoadingService.hpp"
 #include "services/threadService.hpp"
 #include "trace/traceMacros.hpp"
+#include "utilities/align.hpp"
 #include "utilities/bitMap.inline.hpp"
 #include "utilities/exceptions.hpp"
 #include "utilities/globalDefinitions.hpp"
--- old/src/share/vm/classfile/javaClasses.cpp	2017-07-04 23:39:14.477712637 +0200
+++ new/src/share/vm/classfile/javaClasses.cpp	2017-07-04 23:39:14.321707538 +0200
@@ -54,6 +54,7 @@
 #include "runtime/safepoint.hpp"
 #include "runtime/thread.inline.hpp"
 #include "runtime/vframe.hpp"
+#include "utilities/align.hpp"
 #include "utilities/preserveException.hpp"
 
 #if INCLUDE_JVMCI
--- old/src/share/vm/classfile/verifier.cpp	2017-07-04 23:39:14.789722835 +0200
+++ new/src/share/vm/classfile/verifier.cpp	2017-07-04 23:39:14.625717474 +0200
@@ -48,8 +48,8 @@
 #include "runtime/os.hpp"
 #include "runtime/thread.hpp"
 #include "services/threadService.hpp"
+#include "utilities/align.hpp"
 #include "utilities/bytes.hpp"
-#include "logging/log.hpp"
 
 #define NOFAILOVER_MAJOR_VERSION                       51
 #define NONZERO_PADDING_BYTES_IN_SWITCH_MAJOR_VERSION  51
--- old/src/share/vm/code/codeBlob.cpp	2017-07-04 23:39:15.053731463 +0200
+++ new/src/share/vm/code/codeBlob.cpp	2017-07-04 23:39:14.909726757 +0200
@@ -41,6 +41,7 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/vframe.hpp"
 #include "services/memoryService.hpp"
+#include "utilities/align.hpp"
 #ifdef COMPILER1
 #include "c1/c1_Runtime1.hpp"
 #endif
--- old/src/share/vm/code/codeBlob.hpp	2017-07-04 23:39:15.297739439 +0200
+++ new/src/share/vm/code/codeBlob.hpp	2017-07-04 23:39:15.149734601 +0200
@@ -30,6 +30,7 @@
 #include "compiler/oopMap.hpp"
 #include "runtime/frame.hpp"
 #include "runtime/handles.hpp"
+#include "utilities/align.hpp"
 #include "utilities/macros.hpp"
 
 // CodeBlob Types
--- old/src/share/vm/code/codeCache.cpp	2017-07-04 23:39:15.545747545 +0200
+++ new/src/share/vm/code/codeCache.cpp	2017-07-04 23:39:15.397742708 +0200
@@ -50,6 +50,7 @@
 #include "runtime/sweeper.hpp"
 #include "services/memoryService.hpp"
 #include "trace/tracing.hpp"
+#include "utilities/align.hpp"
 #include "utilities/vmError.hpp"
 #include "utilities/xmlstream.hpp"
 #ifdef COMPILER1
--- old/src/share/vm/code/exceptionHandlerTable.hpp	2017-07-04 23:39:15.797755782 +0200
+++ new/src/share/vm/code/exceptionHandlerTable.hpp	2017-07-04 23:39:15.641750683 +0200
@@ -27,6 +27,7 @@
 
 #include "memory/allocation.hpp"
 #include "oops/method.hpp"
+#include "utilities/align.hpp"
 
 // A HandlerTableEntry describes an individual entry of a subtable
 // of ExceptionHandlerTable. An entry consists of a pair(bci, pco),
--- old/src/share/vm/code/icBuffer.hpp	2017-07-04 23:39:16.041763757 +0200
+++ new/src/share/vm/code/icBuffer.hpp	2017-07-04 23:39:15.893758919 +0200
@@ -29,6 +29,7 @@
 #include "code/stubs.hpp"
 #include "interpreter/bytecodes.hpp"
 #include "memory/allocation.hpp"
+#include "utilities/align.hpp"
 
 //
 // For CompiledIC's:
--- old/src/share/vm/code/nmethod.cpp	2017-07-04 23:39:16.245770425 +0200
+++ new/src/share/vm/code/nmethod.cpp	2017-07-04 23:39:16.121766372 +0200
@@ -47,11 +47,11 @@
 #include "runtime/os.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/sweeper.hpp"
-#include "utilities/resourceHash.hpp"
+#include "utilities/align.hpp"
 #include "utilities/dtrace.hpp"
 #include "utilities/events.hpp"
+#include "utilities/resourceHash.hpp"
 #include "utilities/xmlstream.hpp"
-#include "logging/log.hpp"
 #ifdef SHARK
 #include "shark/sharkCompiler.hpp"
 #endif
--- old/src/share/vm/code/stubs.cpp	2017-07-04 23:39:16.521779446 +0200
+++ new/src/share/vm/code/stubs.cpp	2017-07-04 23:39:16.365774347 +0200
@@ -28,6 +28,7 @@
 #include "memory/allocation.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/mutexLocker.hpp"
+#include "utilities/align.hpp"
 
 
 // Implementation of StubQueue
--- old/src/share/vm/code/vtableStubs.cpp	2017-07-04 23:39:16.769787552 +0200
+++ new/src/share/vm/code/vtableStubs.cpp	2017-07-04 23:39:16.617782584 +0200
@@ -36,6 +36,7 @@
 #include "runtime/handles.inline.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/sharedRuntime.hpp"
+#include "utilities/align.hpp"
 #ifdef COMPILER2
 #include "opto/matcher.hpp"
 #endif
--- old/src/share/vm/compiler/oopMap.cpp	2017-07-04 23:39:17.009795396 +0200
+++ new/src/share/vm/compiler/oopMap.cpp	2017-07-04 23:39:16.865790689 +0200
@@ -33,6 +33,7 @@
 #include "memory/resourceArea.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/signature.hpp"
+#include "utilities/align.hpp"
 #ifdef COMPILER1
 #include "c1/c1_Defs.hpp"
 #endif
--- old/src/share/vm/gc/cms/compactibleFreeListSpace.cpp	2017-07-04 23:39:17.233802717 +0200
+++ new/src/share/vm/gc/cms/compactibleFreeListSpace.cpp	2017-07-04 23:39:17.101798403 +0200
@@ -43,6 +43,7 @@
 #include "runtime/java.hpp"
 #include "runtime/orderAccess.inline.hpp"
 #include "runtime/vmThread.hpp"
+#include "utilities/align.hpp"
 #include "utilities/copy.hpp"
 
 /////////////////////////////////////////////////////////////////////////
--- old/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp	2017-07-04 23:39:17.533812523 +0200
+++ new/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp	2017-07-04 23:39:17.369807163 +0200
@@ -70,6 +70,7 @@
 #include "runtime/vmThread.hpp"
 #include "services/memoryService.hpp"
 #include "services/runtimeService.hpp"
+#include "utilities/align.hpp"
 #include "utilities/stack.inline.hpp"
 
 // statics
--- old/src/share/vm/gc/cms/concurrentMarkSweepGeneration.inline.hpp	2017-07-04 23:39:17.917825074 +0200
+++ new/src/share/vm/gc/cms/concurrentMarkSweepGeneration.inline.hpp	2017-07-04 23:39:17.757819845 +0200
@@ -32,6 +32,7 @@
 #include "gc/cms/parNewGeneration.hpp"
 #include "gc/shared/gcUtil.hpp"
 #include "gc/shared/genCollectedHeap.hpp"
+#include "utilities/align.hpp"
 #include "utilities/bitMap.inline.hpp"
 
 inline void CMSBitMap::clear_all() {
--- old/src/share/vm/gc/g1/g1AllocRegion.cpp	2017-07-04 23:39:18.173833442 +0200
+++ new/src/share/vm/gc/g1/g1AllocRegion.cpp	2017-07-04 23:39:18.021828474 +0200
@@ -28,6 +28,7 @@
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "runtime/orderAccess.inline.hpp"
+#include "utilities/align.hpp"
 
 G1CollectedHeap* G1AllocRegion::_g1h = NULL;
 HeapRegion* G1AllocRegion::_dummy_region = NULL;
--- old/src/share/vm/gc/g1/g1Allocator.cpp	2017-07-04 23:39:18.417841417 +0200
+++ new/src/share/vm/gc/g1/g1Allocator.cpp	2017-07-04 23:39:18.265836449 +0200
@@ -29,6 +29,7 @@
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/heapRegion.inline.hpp"
 #include "gc/g1/heapRegionSet.inline.hpp"
+#include "utilities/align.hpp"
 
 G1DefaultAllocator::G1DefaultAllocator(G1CollectedHeap* heap) :
   G1Allocator(heap),
--- old/src/share/vm/gc/g1/g1CardLiveData.cpp	2017-07-04 23:39:18.669849654 +0200
+++ new/src/share/vm/gc/g1/g1CardLiveData.cpp	2017-07-04 23:39:18.517844685 +0200
@@ -33,6 +33,7 @@
 #include "runtime/atomic.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/os.hpp"
+#include "utilities/align.hpp"
 #include "utilities/bitMap.inline.hpp"
 #include "utilities/debug.hpp"
 
--- old/src/share/vm/gc/g1/g1CollectedHeap.cpp	2017-07-04 23:39:18.913857629 +0200
+++ new/src/share/vm/gc/g1/g1CollectedHeap.cpp	2017-07-04 23:39:18.765852791 +0200
@@ -79,6 +79,7 @@
 #include "runtime/init.hpp"
 #include "runtime/orderAccess.inline.hpp"
 #include "runtime/vmThread.hpp"
+#include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/stack.inline.hpp"
 
--- old/src/share/vm/gc/g1/g1ConcurrentMark.cpp	2017-07-04 23:39:19.237868219 +0200
+++ new/src/share/vm/gc/g1/g1ConcurrentMark.cpp	2017-07-04 23:39:19.081863120 +0200
@@ -57,6 +57,7 @@
 #include "runtime/java.hpp"
 #include "runtime/prefetch.inline.hpp"
 #include "services/memTracker.hpp"
+#include "utilities/align.hpp"
 #include "utilities/growableArray.hpp"
 
 // Concurrent marking bit map wrapper
--- old/src/share/vm/gc/g1/g1PageBasedVirtualSpace.cpp	2017-07-04 23:39:19.493876586 +0200
+++ new/src/share/vm/gc/g1/g1PageBasedVirtualSpace.cpp	2017-07-04 23:39:19.361872272 +0200
@@ -30,6 +30,7 @@
 #include "runtime/atomic.hpp"
 #include "runtime/os.inline.hpp"
 #include "services/memTracker.hpp"
+#include "utilities/align.hpp"
 #include "utilities/bitMap.inline.hpp"
 
 G1PageBasedVirtualSpace::G1PageBasedVirtualSpace(ReservedSpace rs, size_t used_size, size_t page_size) :
--- old/src/share/vm/gc/g1/g1PageBasedVirtualSpace.hpp	2017-07-04 23:39:19.733884431 +0200
+++ new/src/share/vm/gc/g1/g1PageBasedVirtualSpace.hpp	2017-07-04 23:39:19.585879593 +0200
@@ -28,6 +28,7 @@
 #include "memory/allocation.hpp"
 #include "memory/memRegion.hpp"
 #include "memory/virtualspace.hpp"
+#include "utilities/align.hpp"
 #include "utilities/bitMap.hpp"
 
 class WorkGang;
--- old/src/share/vm/gc/g1/g1RegionToSpaceMapper.cpp	2017-07-04 23:39:19.929890837 +0200
+++ new/src/share/vm/gc/g1/g1RegionToSpaceMapper.cpp	2017-07-04 23:39:19.805886784 +0200
@@ -28,6 +28,7 @@
 #include "memory/allocation.inline.hpp"
 #include "memory/virtualspace.hpp"
 #include "services/memTracker.hpp"
+#include "utilities/align.hpp"
 #include "utilities/bitMap.inline.hpp"
 
 G1RegionToSpaceMapper::G1RegionToSpaceMapper(ReservedSpace rs,
--- old/src/share/vm/gc/g1/g1RemSet.cpp	2017-07-04 23:39:20.161898420 +0200
+++ new/src/share/vm/gc/g1/g1RemSet.cpp	2017-07-04 23:39:20.009893451 +0200
@@ -40,6 +40,7 @@
 #include "memory/iterator.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/oop.inline.hpp"
+#include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/intHisto.hpp"
 #include "utilities/stack.inline.hpp"
--- old/src/share/vm/gc/g1/heapRegion.inline.hpp	2017-07-04 23:39:20.417906787 +0200
+++ new/src/share/vm/gc/g1/heapRegion.inline.hpp	2017-07-04 23:39:20.265901819 +0200
@@ -31,6 +31,7 @@
 #include "gc/shared/space.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/atomic.hpp"
+#include "utilities/align.hpp"
 
 inline HeapWord* G1ContiguousSpace::allocate_impl(size_t min_word_size,
                                                   size_t desired_word_size,
--- old/src/share/vm/gc/g1/ptrQueue.hpp	2017-07-04 23:39:20.669915024 +0200
+++ new/src/share/vm/gc/g1/ptrQueue.hpp	2017-07-04 23:39:20.513909925 +0200
@@ -26,6 +26,7 @@
 #define SHARE_VM_GC_G1_PTRQUEUE_HPP
 
 #include "memory/allocation.hpp"
+#include "utilities/align.hpp"
 #include "utilities/sizes.hpp"
 
 // There are various techniques that require threads to be able to log
--- old/src/share/vm/gc/g1/sparsePRT.hpp	2017-07-04 23:39:20.905922737 +0200
+++ new/src/share/vm/gc/g1/sparsePRT.hpp	2017-07-04 23:39:20.765918162 +0200
@@ -30,6 +30,7 @@
 #include "gc/shared/cardTableModRefBS.hpp"
 #include "memory/allocation.hpp"
 #include "runtime/mutex.hpp"
+#include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 // Sparse remembered set for a heap region (the "owning" region).  Maps
--- old/src/share/vm/gc/parallel/adjoiningGenerations.cpp	2017-07-04 23:39:21.153930844 +0200
+++ new/src/share/vm/gc/parallel/adjoiningGenerations.cpp	2017-07-04 23:39:20.997925745 +0200
@@ -29,6 +29,7 @@
 #include "gc/parallel/parallelScavengeHeap.hpp"
 #include "logging/log.hpp"
 #include "memory/resourceArea.hpp"
+#include "utilities/align.hpp"
 #include "utilities/ostream.hpp"
 
 // If boundary moving is being used, create the young gen and old
--- old/src/share/vm/gc/parallel/asPSOldGen.cpp	2017-07-04 23:39:21.405939080 +0200
+++ new/src/share/vm/gc/parallel/asPSOldGen.cpp	2017-07-04 23:39:21.249933982 +0200
@@ -30,6 +30,7 @@
 #include "gc/shared/cardTableModRefBS.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/java.hpp"
+#include "utilities/align.hpp"
 
 // Whereas PSOldGen takes the maximum size of the generation
 // (which doesn't change in the case of PSOldGen) as a parameter,
--- old/src/share/vm/gc/parallel/asPSYoungGen.cpp	2017-07-04 23:39:21.613945878 +0200
+++ new/src/share/vm/gc/parallel/asPSYoungGen.cpp	2017-07-04 23:39:21.469941172 +0200
@@ -32,6 +32,7 @@
 #include "gc/shared/spaceDecorator.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/java.hpp"
+#include "utilities/align.hpp"
 
 ASPSYoungGen::ASPSYoungGen(size_t init_byte_size,
                            size_t minimum_byte_size,
--- old/src/share/vm/gc/parallel/cardTableExtension.cpp	2017-07-04 23:39:21.869954246 +0200
+++ new/src/share/vm/gc/parallel/cardTableExtension.cpp	2017-07-04 23:39:21.709949016 +0200
@@ -33,6 +33,7 @@
 #include "gc/parallel/psYoungGen.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/prefetch.inline.hpp"
+#include "utilities/align.hpp"
 
 // Checks an individual oop for missing precise marks. Mark
 // may be either dirty or newgen.
--- old/src/share/vm/gc/parallel/generationSizer.cpp	2017-07-04 23:39:22.113962221 +0200
+++ new/src/share/vm/gc/parallel/generationSizer.cpp	2017-07-04 23:39:21.969957515 +0200
@@ -26,6 +26,7 @@
 #include "gc/parallel/generationSizer.hpp"
 #include "gc/shared/collectorPolicy.hpp"
 #include "runtime/globals_extension.hpp"
+#include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 void GenerationSizer::initialize_alignments() {
--- old/src/share/vm/gc/parallel/mutableNUMASpace.cpp	2017-07-04 23:39:22.337969543 +0200
+++ new/src/share/vm/gc/parallel/mutableNUMASpace.cpp	2017-07-04 23:39:22.201965098 +0200
@@ -29,6 +29,7 @@
 #include "oops/oop.inline.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/thread.inline.hpp"
+#include "utilities/align.hpp"
 
 MutableNUMASpace::MutableNUMASpace(size_t alignment) : MutableSpace(alignment), _must_use_large_pages(false) {
   _lgrp_spaces = new (ResourceObj::C_HEAP, mtGC) GrowableArray<LGRPSpace*>(0, true);
--- old/src/share/vm/gc/parallel/mutableSpace.cpp	2017-07-04 23:39:22.589977779 +0200
+++ new/src/share/vm/gc/parallel/mutableSpace.cpp	2017-07-04 23:39:22.445973073 +0200
@@ -29,6 +29,7 @@
 #include "runtime/atomic.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/thread.hpp"
+#include "utilities/align.hpp"
 #include "utilities/macros.hpp"
 
 MutableSpace::MutableSpace(size_t alignment): ImmutableSpace(), _top(NULL), _alignment(alignment) {
--- old/src/share/vm/gc/parallel/objectStartArray.cpp	2017-07-04 23:39:22.841986015 +0200
+++ new/src/share/vm/gc/parallel/objectStartArray.cpp	2017-07-04 23:39:22.689981048 +0200
@@ -29,6 +29,7 @@
 #include "oops/oop.inline.hpp"
 #include "runtime/java.hpp"
 #include "services/memTracker.hpp"
+#include "utilities/align.hpp"
 
 void ObjectStartArray::initialize(MemRegion reserved_region) {
   // We're based on the assumption that we use the same
--- old/src/share/vm/gc/parallel/parMarkBitMap.cpp	2017-07-04 23:39:23.085993991 +0200
+++ new/src/share/vm/gc/parallel/parMarkBitMap.cpp	2017-07-04 23:39:22.937989154 +0200
@@ -30,6 +30,7 @@
 #include "runtime/atomic.hpp"
 #include "runtime/os.hpp"
 #include "services/memTracker.hpp"
+#include "utilities/align.hpp"
 #include "utilities/bitMap.inline.hpp"
 
 bool
--- old/src/share/vm/gc/parallel/psAdaptiveSizePolicy.cpp	2017-07-04 23:39:23.330001967 +0200
+++ new/src/share/vm/gc/parallel/psAdaptiveSizePolicy.cpp	2017-07-04 23:39:23.177996998 +0200
@@ -32,6 +32,7 @@
 #include "gc/shared/gcPolicyCounters.hpp"
 #include "logging/log.hpp"
 #include "runtime/timer.hpp"
+#include "utilities/align.hpp"
 
 #include <math.h>
 
--- old/src/share/vm/gc/parallel/psAdaptiveSizePolicy.hpp	2017-07-04 23:39:23.590010464 +0200
+++ new/src/share/vm/gc/parallel/psAdaptiveSizePolicy.hpp	2017-07-04 23:39:23.442005627 +0200
@@ -29,6 +29,7 @@
 #include "gc/shared/gcCause.hpp"
 #include "gc/shared/gcStats.hpp"
 #include "gc/shared/gcUtil.hpp"
+#include "utilities/align.hpp"
 
 // This class keeps statistical information and computes the
 // optimal free space for both the young and old generation
--- old/src/share/vm/gc/parallel/psMarkSweep.cpp	2017-07-04 23:39:23.814017785 +0200
+++ new/src/share/vm/gc/parallel/psMarkSweep.cpp	2017-07-04 23:39:23.674013210 +0200
@@ -55,6 +55,7 @@
 #include "runtime/vmThread.hpp"
 #include "services/management.hpp"
 #include "services/memoryService.hpp"
+#include "utilities/align.hpp"
 #include "utilities/events.hpp"
 #include "utilities/stack.inline.hpp"
 
--- old/src/share/vm/gc/parallel/psOldGen.cpp	2017-07-04 23:39:24.070026152 +0200
+++ new/src/share/vm/gc/parallel/psOldGen.cpp	2017-07-04 23:39:23.906020793 +0200
@@ -34,6 +34,7 @@
 #include "logging/log.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/java.hpp"
+#include "utilities/align.hpp"
 
 inline const char* PSOldGen::select_name() {
   return UseParallelOldGC ? "ParOldGen" : "PSOldGen";
--- old/src/share/vm/gc/parallel/psParallelCompact.cpp	2017-07-04 23:39:24.318034259 +0200
+++ new/src/share/vm/gc/parallel/psParallelCompact.cpp	2017-07-04 23:39:24.170029422 +0200
@@ -66,6 +66,7 @@
 #include "services/management.hpp"
 #include "services/memTracker.hpp"
 #include "services/memoryService.hpp"
+#include "utilities/align.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/events.hpp"
 #include "utilities/formatBuffer.hpp"
--- old/src/share/vm/gc/parallel/psPromotionLAB.inline.hpp	2017-07-04 23:39:24.578042757 +0200
+++ new/src/share/vm/gc/parallel/psPromotionLAB.inline.hpp	2017-07-04 23:39:24.426037789 +0200
@@ -27,6 +27,7 @@
 
 #include "gc/parallel/psPromotionLAB.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
+#include "utilities/align.hpp"
 
 HeapWord* PSYoungPromotionLAB::allocate(size_t size) {
   // Can't assert this, when young fills, we keep the LAB around, but flushed.
--- old/src/share/vm/gc/parallel/psYoungGen.cpp	2017-07-04 23:39:24.798049948 +0200
+++ new/src/share/vm/gc/parallel/psYoungGen.cpp	2017-07-04 23:39:24.658045372 +0200
@@ -33,6 +33,7 @@
 #include "logging/log.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/java.hpp"
+#include "utilities/align.hpp"
 
 PSYoungGen::PSYoungGen(size_t        initial_size,
                        size_t        min_size,
--- old/src/share/vm/gc/serial/defNewGeneration.cpp	2017-07-04 23:39:25.010056877 +0200
+++ new/src/share/vm/gc/serial/defNewGeneration.cpp	2017-07-04 23:39:24.886052823 +0200
@@ -50,6 +50,7 @@
 #include "runtime/java.hpp"
 #include "runtime/prefetch.inline.hpp"
 #include "runtime/thread.inline.hpp"
+#include "utilities/align.hpp"
 #include "utilities/copy.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/stack.inline.hpp"
--- old/src/share/vm/gc/serial/defNewGeneration.hpp	2017-07-04 23:39:25.222063806 +0200
+++ new/src/share/vm/gc/serial/defNewGeneration.hpp	2017-07-04 23:39:25.098059754 +0200
@@ -31,6 +31,7 @@
 #include "gc/shared/generation.hpp"
 #include "gc/shared/generationCounters.hpp"
 #include "gc/shared/preservedMarks.hpp"
+#include "utilities/align.hpp"
 #include "utilities/stack.hpp"
 
 class ContiguousSpace;
--- old/src/share/vm/gc/shared/barrierSet.inline.hpp	2017-07-04 23:39:25.466071782 +0200
+++ new/src/share/vm/gc/shared/barrierSet.inline.hpp	2017-07-04 23:39:25.318066944 +0200
@@ -27,6 +27,7 @@
 
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/cardTableModRefBS.inline.hpp"
+#include "utilities/align.hpp"
 
 // Inline functions of BarrierSet, which de-virtualize certain
 // performance-critical calls when the barrier is the most common
--- old/src/share/vm/gc/shared/cardTableModRefBS.cpp	2017-07-04 23:39:25.718080018 +0200
+++ new/src/share/vm/gc/shared/cardTableModRefBS.cpp	2017-07-04 23:39:25.562074919 +0200
@@ -30,6 +30,7 @@
 #include "memory/virtualspace.hpp"
 #include "logging/log.hpp"
 #include "services/memTracker.hpp"
+#include "utilities/align.hpp"
 #include "utilities/macros.hpp"
 
 // This kind of "BarrierSet" allows a "CollectedHeap" to detect and
--- old/src/share/vm/gc/shared/cardTableModRefBS.hpp	2017-07-04 23:39:25.978088516 +0200
+++ new/src/share/vm/gc/shared/cardTableModRefBS.hpp	2017-07-04 23:39:25.822083417 +0200
@@ -27,6 +27,7 @@
 
 #include "gc/shared/modRefBarrierSet.hpp"
 #include "oops/oop.hpp"
+#include "utilities/align.hpp"
 
 // This kind of "BarrierSet" allows a "CollectedHeap" to detect and
 // enumerate ref fields that have been modified (since the last
--- old/src/share/vm/gc/shared/collectedHeap.cpp	2017-07-04 23:39:26.206095969 +0200
+++ new/src/share/vm/gc/shared/collectedHeap.cpp	2017-07-04 23:39:26.058091131 +0200
@@ -41,6 +41,7 @@
 #include "runtime/init.hpp"
 #include "runtime/thread.inline.hpp"
 #include "services/heapDumper.hpp"
+#include "utilities/align.hpp"
 
 
 #ifdef ASSERT
--- old/src/share/vm/gc/shared/collectedHeap.inline.hpp	2017-07-04 23:39:26.434103420 +0200
+++ new/src/share/vm/gc/shared/collectedHeap.inline.hpp	2017-07-04 23:39:26.298098975 +0200
@@ -36,6 +36,7 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/thread.inline.hpp"
 #include "services/lowMemoryDetector.hpp"
+#include "utilities/align.hpp"
 #include "utilities/copy.hpp"
 
 // Inline allocation implementations.
--- old/src/share/vm/gc/shared/collectorPolicy.cpp	2017-07-04 23:39:26.670111134 +0200
+++ new/src/share/vm/gc/shared/collectorPolicy.cpp	2017-07-04 23:39:26.530106558 +0200
@@ -40,6 +40,7 @@
 #include "runtime/java.hpp"
 #include "runtime/thread.inline.hpp"
 #include "runtime/vmThread.hpp"
+#include "utilities/align.hpp"
 #include "utilities/macros.hpp"
 
 // CollectorPolicy methods
--- old/src/share/vm/gc/shared/generationSpec.hpp	2017-07-04 23:39:26.918119240 +0200
+++ new/src/share/vm/gc/shared/generationSpec.hpp	2017-07-04 23:39:26.774114533 +0200
@@ -26,6 +26,7 @@
 #define SHARE_VM_GC_SHARED_GENERATIONSPEC_HPP
 
 #include "gc/shared/generation.hpp"
+#include "utilities/align.hpp"
 
 // The specification of a generation.  This class also encapsulates
 // some generation-specific behavior.  This is done here rather than as a
--- old/src/share/vm/gc/shared/space.cpp	2017-07-04 23:39:27.174127607 +0200
+++ new/src/share/vm/gc/shared/space.cpp	2017-07-04 23:39:27.010122247 +0200
@@ -40,6 +40,7 @@
 #include "runtime/orderAccess.inline.hpp"
 #include "runtime/prefetch.inline.hpp"
 #include "runtime/safepoint.hpp"
+#include "utilities/align.hpp"
 #include "utilities/copy.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
--- old/src/share/vm/gc/shared/space.hpp	2017-07-04 23:39:27.438136236 +0200
+++ new/src/share/vm/gc/shared/space.hpp	2017-07-04 23:39:27.278131007 +0200
@@ -33,6 +33,7 @@
 #include "memory/memRegion.hpp"
 #include "oops/markOop.hpp"
 #include "runtime/mutexLocker.hpp"
+#include "utilities/align.hpp"
 #include "utilities/macros.hpp"
 
 // A space is an abstraction for the "storage units" backing
--- old/src/share/vm/interpreter/bytecode.hpp	2017-07-04 23:39:27.686144342 +0200
+++ new/src/share/vm/interpreter/bytecode.hpp	2017-07-04 23:39:27.538139505 +0200
@@ -28,6 +28,7 @@
 #include "interpreter/bytecodes.hpp"
 #include "memory/allocation.hpp"
 #include "oops/method.hpp"
+#include "utilities/align.hpp"
 #include "utilities/bytes.hpp"
 
 class ciBytecodeStream;
--- old/src/share/vm/interpreter/bytecodeTracer.cpp	2017-07-04 23:39:27.950152971 +0200
+++ new/src/share/vm/interpreter/bytecodeTracer.cpp	2017-07-04 23:39:27.790147740 +0200
@@ -34,6 +34,7 @@
 #include "oops/method.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/timer.hpp"
+#include "utilities/align.hpp"
 
 
 // Standard closure for BytecodeTracer: prints the current bytecode
--- old/src/share/vm/interpreter/bytecodes.cpp	2017-07-04 23:39:28.178160422 +0200
+++ new/src/share/vm/interpreter/bytecodes.cpp	2017-07-04 23:39:28.042155978 +0200
@@ -26,6 +26,7 @@
 #include "interpreter/bytecodes.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/method.hpp"
+#include "utilities/align.hpp"
 #include "utilities/bytes.hpp"
 
 
--- old/src/share/vm/interpreter/interpreter.hpp	2017-07-04 23:39:28.362166436 +0200
+++ new/src/share/vm/interpreter/interpreter.hpp	2017-07-04 23:39:28.242162514 +0200
@@ -29,6 +29,7 @@
 #include "interpreter/cppInterpreter.hpp"
 #include "interpreter/templateInterpreter.hpp"
 #include "memory/resourceArea.hpp"
+#include "utilities/align.hpp"
 
 // This file contains the platform-independent parts
 // of the interpreter and the interpreter generator.
--- old/src/share/vm/interpreter/interpreterRuntime.cpp	2017-07-04 23:39:28.590173889 +0200
+++ new/src/share/vm/interpreter/interpreterRuntime.cpp	2017-07-04 23:39:28.450169314 +0200
@@ -62,6 +62,7 @@
 #include "runtime/stubRoutines.hpp"
 #include "runtime/synchronizer.hpp"
 #include "runtime/threadCritical.hpp"
+#include "utilities/align.hpp"
 #include "utilities/events.hpp"
 #ifdef COMPILER2
 #include "opto/runtime.hpp"
--- old/src/share/vm/jvmci/jvmciCodeInstaller.cpp	2017-07-04 23:39:28.850182387 +0200
+++ new/src/share/vm/jvmci/jvmciCodeInstaller.cpp	2017-07-04 23:39:28.702177550 +0200
@@ -37,6 +37,7 @@
 #include "oops/oop.inline.hpp"
 #include "oops/objArrayOop.inline.hpp"
 #include "runtime/javaCalls.hpp"
+#include "utilities/align.hpp"
 
 // frequently used constants
 // Allocate them with new so they are never destroyed (otherwise, a
--- old/src/share/vm/memory/allocation.hpp	2017-07-04 23:39:29.106190754 +0200
+++ new/src/share/vm/memory/allocation.hpp	2017-07-04 23:39:28.962186047 +0200
@@ -37,6 +37,11 @@
 
 #include <new>
 
+// The byte alignment to be used by Arena::Amalloc.  See bugid 4169348.
+// Note: this value must be a power of 2
+
+#define ARENA_AMALLOC_ALIGNMENT (2*BytesPerWord)
+
 #define ARENA_ALIGN_M1 (((size_t)(ARENA_AMALLOC_ALIGNMENT)) - 1)
 #define ARENA_ALIGN_MASK (~((size_t)ARENA_ALIGN_M1))
 #define ARENA_ALIGN(x) ((((size_t)(x)) + ARENA_ALIGN_M1) & ARENA_ALIGN_MASK)
--- old/src/share/vm/memory/allocation.inline.hpp	2017-07-04 23:39:29.350198729 +0200
+++ new/src/share/vm/memory/allocation.inline.hpp	2017-07-04 23:39:29.206194022 +0200
@@ -28,6 +28,7 @@
 #include "runtime/atomic.hpp"
 #include "runtime/os.hpp"
 #include "services/memTracker.hpp"
+#include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 // Explicit C-heap memory management
--- old/src/share/vm/memory/filemap.cpp	2017-07-04 23:39:29.626207751 +0200
+++ new/src/share/vm/memory/filemap.cpp	2017-07-04 23:39:29.442201737 +0200
@@ -45,6 +45,7 @@
 #include "runtime/os.hpp"
 #include "runtime/vm_version.hpp"
 #include "services/memTracker.hpp"
+#include "utilities/align.hpp"
 #include "utilities/defaultStream.hpp"
 
 # include <sys/stat.h>
--- old/src/share/vm/memory/filemap.hpp	2017-07-04 23:39:29.882216118 +0200
+++ new/src/share/vm/memory/filemap.hpp	2017-07-04 23:39:29.738211411 +0200
@@ -27,6 +27,7 @@
 
 #include "memory/metaspaceShared.hpp"
 #include "memory/metaspace.hpp"
+#include "utilities/align.hpp"
 
 // Layout of the file:
 //  header: dump of archive instance plus versioning info, datestamp, etc.
--- old/src/share/vm/memory/heap.cpp	2017-07-04 23:39:30.138224486 +0200
+++ new/src/share/vm/memory/heap.cpp	2017-07-04 23:39:29.974219124 +0200
@@ -27,6 +27,7 @@
 #include "oops/oop.inline.hpp"
 #include "runtime/os.hpp"
 #include "services/memTracker.hpp"
+#include "utilities/align.hpp"
 
 size_t CodeHeap::header_size() {
   return sizeof(HeapBlock);
--- old/src/share/vm/memory/metachunk.cpp	2017-07-04 23:39:30.398232983 +0200
+++ new/src/share/vm/memory/metachunk.cpp	2017-07-04 23:39:30.238227754 +0200
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "memory/allocation.hpp"
 #include "memory/metachunk.hpp"
+#include "utilities/align.hpp"
 #include "utilities/copy.hpp"
 #include "utilities/debug.hpp"
 
--- old/src/share/vm/memory/metaspace.cpp	2017-07-04 23:39:30.614240044 +0200
+++ new/src/share/vm/memory/metaspace.cpp	2017-07-04 23:39:30.482235729 +0200
@@ -46,6 +46,7 @@
 #include "runtime/orderAccess.inline.hpp"
 #include "services/memTracker.hpp"
 #include "services/memoryService.hpp"
+#include "utilities/align.hpp"
 #include "utilities/copy.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/macros.hpp"
--- old/src/share/vm/memory/metaspaceShared.cpp	2017-07-04 23:39:30.930250371 +0200
+++ new/src/share/vm/memory/metaspaceShared.cpp	2017-07-04 23:39:30.766245011 +0200
@@ -55,6 +55,7 @@
 #include "runtime/signature.hpp"
 #include "runtime/vmThread.hpp"
 #include "runtime/vm_operations.hpp"
+#include "utilities/align.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/hashtable.inline.hpp"
 
--- old/src/share/vm/memory/padded.hpp	2017-07-04 23:39:31.182258608 +0200
+++ new/src/share/vm/memory/padded.hpp	2017-07-04 23:39:31.038253901 +0200
@@ -26,6 +26,7 @@
 #define SHARE_VM_MEMORY_PADDED_HPP
 
 #include "memory/allocation.hpp"
+#include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 // Bytes needed to pad type to avoid cache-line sharing; alignment should be the
--- old/src/share/vm/memory/padded.inline.hpp	2017-07-04 23:39:31.434266845 +0200
+++ new/src/share/vm/memory/padded.inline.hpp	2017-07-04 23:39:31.278261746 +0200
@@ -27,6 +27,7 @@
 
 #include "memory/allocation.inline.hpp"
 #include "memory/padded.hpp"
+#include "utilities/align.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 
--- old/src/share/vm/memory/universe.cpp	2017-07-04 23:39:31.690275212 +0200
+++ new/src/share/vm/memory/universe.cpp	2017-07-04 23:39:31.530269982 +0200
@@ -72,6 +72,7 @@
 #include "runtime/timerTrace.hpp"
 #include "runtime/vm_operations.hpp"
 #include "services/memoryService.hpp"
+#include "utilities/align.hpp"
 #include "utilities/copy.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/events.hpp"
--- old/src/share/vm/memory/virtualspace.cpp	2017-07-04 23:39:31.942283449 +0200
+++ new/src/share/vm/memory/virtualspace.cpp	2017-07-04 23:39:31.790278481 +0200
@@ -29,6 +29,7 @@
 #include "oops/markOop.hpp"
 #include "oops/oop.inline.hpp"
 #include "services/memTracker.hpp"
+#include "utilities/align.hpp"
 
 // ReservedSpace
 
--- old/src/share/vm/oops/array.hpp	2017-07-04 23:39:32.182291293 +0200
+++ new/src/share/vm/oops/array.hpp	2017-07-04 23:39:32.034286456 +0200
@@ -29,6 +29,7 @@
 #include "memory/allocation.inline.hpp"
 #include "memory/metaspace.hpp"
 #include "runtime/orderAccess.hpp"
+#include "utilities/align.hpp"
 
 // Array for metadata allocation
 
--- old/src/share/vm/oops/arrayOop.hpp	2017-07-04 23:39:32.434299529 +0200
+++ new/src/share/vm/oops/arrayOop.hpp	2017-07-04 23:39:32.274294299 +0200
@@ -27,6 +27,7 @@
 
 #include "memory/universe.inline.hpp"
 #include "oops/oop.hpp"
+#include "utilities/align.hpp"
 
 // arrayOopDesc is the abstract baseclass for all arrays.  It doesn't
 // declare pure virtual to enforce this because that would allocate a vtbl
--- old/src/share/vm/oops/constMethod.cpp	2017-07-04 23:39:32.666307112 +0200
+++ new/src/share/vm/oops/constMethod.cpp	2017-07-04 23:39:32.522302405 +0200
@@ -30,6 +30,7 @@
 #include "memory/resourceArea.hpp"
 #include "oops/constMethod.hpp"
 #include "oops/method.hpp"
+#include "utilities/align.hpp"
 
 // Static initialization
 const u2 ConstMethod::MAX_IDNUM   = 0xFFFE;
--- old/src/share/vm/oops/constMethod.hpp	2017-07-04 23:39:32.902314826 +0200
+++ new/src/share/vm/oops/constMethod.hpp	2017-07-04 23:39:32.758310120 +0200
@@ -26,6 +26,7 @@
 #define SHARE_VM_OOPS_CONSTMETHODOOP_HPP
 
 #include "oops/oop.hpp"
+#include "utilities/align.hpp"
 
 // An ConstMethod represents portions of a Java method which are not written to after
 // the classfile is parsed(*see below).  This part of the method can be shared across
--- old/src/share/vm/oops/constantPool.hpp	2017-07-04 23:39:33.162323324 +0200
+++ new/src/share/vm/oops/constantPool.hpp	2017-07-04 23:39:33.006318225 +0200
@@ -31,6 +31,7 @@
 #include "oops/symbol.hpp"
 #include "oops/typeArrayOop.hpp"
 #include "runtime/handles.hpp"
+#include "utilities/align.hpp"
 #include "utilities/bytes.hpp"
 #include "utilities/constantTag.hpp"
 
--- old/src/share/vm/oops/cpCache.hpp	2017-07-04 23:39:33.422331822 +0200
+++ new/src/share/vm/oops/cpCache.hpp	2017-07-04 23:39:33.274326985 +0200
@@ -29,6 +29,7 @@
 #include "memory/allocation.hpp"
 #include "oops/array.hpp"
 #include "runtime/orderAccess.hpp"
+#include "utilities/align.hpp"
 
 class PSPromotionManager;
 
--- old/src/share/vm/oops/instanceKlass.hpp	2017-07-04 23:39:33.650339275 +0200
+++ new/src/share/vm/oops/instanceKlass.hpp	2017-07-04 23:39:33.510334698 +0200
@@ -40,6 +40,7 @@
 #include "runtime/os.hpp"
 #include "trace/traceMacros.hpp"
 #include "utilities/accessFlags.hpp"
+#include "utilities/align.hpp"
 #include "utilities/macros.hpp"
 
 // An InstanceKlass is the VM level representation of a Java class.
--- old/src/share/vm/oops/method.cpp	2017-07-04 23:39:33.898347380 +0200
+++ new/src/share/vm/oops/method.cpp	2017-07-04 23:39:33.758342804 +0200
@@ -58,6 +58,7 @@
 #include "runtime/relocator.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/signature.hpp"
+#include "utilities/align.hpp"
 #include "utilities/quickSort.hpp"
 #include "utilities/vmError.hpp"
 #include "utilities/xmlstream.hpp"
--- old/src/share/vm/oops/method.hpp	2017-07-04 23:39:34.158355878 +0200
+++ new/src/share/vm/oops/method.hpp	2017-07-04 23:39:34.014351171 +0200
@@ -37,6 +37,7 @@
 #include "oops/oop.hpp"
 #include "oops/typeArrayOop.hpp"
 #include "utilities/accessFlags.hpp"
+#include "utilities/align.hpp"
 #include "utilities/growableArray.hpp"
 
 // A Method represents a Java method.
--- old/src/share/vm/oops/methodCounters.hpp	2017-07-04 23:39:34.418364376 +0200
+++ new/src/share/vm/oops/methodCounters.hpp	2017-07-04 23:39:34.266359408 +0200
@@ -29,6 +29,7 @@
 #include "compiler/compilerOracle.hpp"
 #include "interpreter/invocationCounter.hpp"
 #include "runtime/arguments.hpp"
+#include "utilities/align.hpp"
 
 class MethodCounters : public Metadata {
  friend class VMStructs;
--- old/src/share/vm/oops/methodData.cpp	2017-07-04 23:39:34.666372481 +0200
+++ new/src/share/vm/oops/methodData.cpp	2017-07-04 23:39:34.510367383 +0200
@@ -37,6 +37,7 @@
 #include "runtime/deoptimization.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/orderAccess.inline.hpp"
+#include "utilities/align.hpp"
 #include "utilities/copy.hpp"
 
 // ==================================================================
--- old/src/share/vm/oops/methodData.hpp	2017-07-04 23:39:34.914380588 +0200
+++ new/src/share/vm/oops/methodData.hpp	2017-07-04 23:39:34.778376143 +0200
@@ -30,6 +30,7 @@
 #include "oops/method.hpp"
 #include "oops/oop.hpp"
 #include "runtime/orderAccess.hpp"
+#include "utilities/align.hpp"
 #if INCLUDE_JVMCI
 #include "jvmci/jvmci_globals.hpp"
 #endif
--- old/src/share/vm/oops/objArrayOop.hpp	2017-07-04 23:39:35.170388955 +0200
+++ new/src/share/vm/oops/objArrayOop.hpp	2017-07-04 23:39:35.010383725 +0200
@@ -27,6 +27,7 @@
 
 #include "gc/shared/specialized_oop_closures.hpp"
 #include "oops/arrayOop.hpp"
+#include "utilities/align.hpp"
 
 // An objArrayOop is an array containing oops.
 // Evaluating "String arg[10]" will create an objArrayOop.
--- old/src/share/vm/oops/oop.inline.hpp	2017-07-04 23:39:35.418397061 +0200
+++ new/src/share/vm/oops/oop.inline.hpp	2017-07-04 23:39:35.254391700 +0200
@@ -39,6 +39,7 @@
 #include "runtime/atomic.hpp"
 #include "runtime/orderAccess.inline.hpp"
 #include "runtime/os.hpp"
+#include "utilities/align.hpp"
 #include "utilities/macros.hpp"
 
 inline void update_barrier_set(void* p, oop v, bool release = false) {
--- old/src/share/vm/opto/buildOopMap.cpp	2017-07-04 23:39:35.726407128 +0200
+++ new/src/share/vm/opto/buildOopMap.cpp	2017-07-04 23:39:35.518400329 +0200
@@ -34,6 +34,7 @@
 #include "opto/phase.hpp"
 #include "opto/regalloc.hpp"
 #include "opto/rootnode.hpp"
+#include "utilities/align.hpp"
 
 // The functions in this file builds OopMaps after all scheduling is done.
 //
--- old/src/share/vm/opto/chaitin.cpp	2017-07-04 23:39:35.974415233 +0200
+++ new/src/share/vm/opto/chaitin.cpp	2017-07-04 23:39:35.814410004 +0200
@@ -41,6 +41,7 @@
 #include "opto/movenode.hpp"
 #include "opto/opcodes.hpp"
 #include "opto/rootnode.hpp"
+#include "utilities/align.hpp"
 
 #ifndef PRODUCT
 void LRG::dump() const {
--- old/src/share/vm/opto/compile.cpp	2017-07-04 23:39:36.250424255 +0200
+++ new/src/share/vm/opto/compile.cpp	2017-07-04 23:39:36.098419286 +0200
@@ -71,6 +71,7 @@
 #include "runtime/signature.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "runtime/timer.hpp"
+#include "utilities/align.hpp"
 #include "utilities/copy.hpp"
 
 
--- old/src/share/vm/opto/macroArrayCopy.cpp	2017-07-04 23:39:36.562434452 +0200
+++ new/src/share/vm/opto/macroArrayCopy.cpp	2017-07-04 23:39:36.402429223 +0200
@@ -29,6 +29,7 @@
 #include "opto/graphKit.hpp"
 #include "opto/macro.hpp"
 #include "opto/runtime.hpp"
+#include "utilities/align.hpp"
 
 
 void PhaseMacroExpand::insert_mem_bar(Node** ctrl, Node** mem, int opcode, Node* precedent) {
--- old/src/share/vm/opto/matcher.cpp	2017-07-04 23:39:36.814442689 +0200
+++ new/src/share/vm/opto/matcher.cpp	2017-07-04 23:39:36.674438113 +0200
@@ -40,6 +40,7 @@
 #include "opto/vectornode.hpp"
 #include "runtime/os.hpp"
 #include "runtime/sharedRuntime.hpp"
+#include "utilities/align.hpp"
 
 OptoReg::Name OptoReg::c_frame_pointer;
 
--- old/src/share/vm/opto/memnode.cpp	2017-07-04 23:39:37.090451710 +0200
+++ new/src/share/vm/opto/memnode.cpp	2017-07-04 23:39:36.950447134 +0200
@@ -42,6 +42,7 @@
 #include "opto/narrowptrnode.hpp"
 #include "opto/phaseX.hpp"
 #include "opto/regmask.hpp"
+#include "utilities/align.hpp"
 #include "utilities/copy.hpp"
 #include "utilities/vmError.hpp"
 
--- old/src/share/vm/prims/unsafe.cpp	2017-07-04 23:39:37.358460469 +0200
+++ new/src/share/vm/prims/unsafe.cpp	2017-07-04 23:39:37.218455892 +0200
@@ -41,6 +41,7 @@
 #include "runtime/vm_version.hpp"
 #include "services/threadService.hpp"
 #include "trace/tracing.hpp"
+#include "utilities/align.hpp"
 #include "utilities/copy.hpp"
 #include "utilities/dtrace.hpp"
 #include "utilities/macros.hpp"
--- old/src/share/vm/prims/whitebox.cpp	2017-07-04 23:39:37.626469229 +0200
+++ new/src/share/vm/prims/whitebox.cpp	2017-07-04 23:39:37.470464130 +0200
@@ -55,6 +55,7 @@
 #include "runtime/sweeper.hpp"
 #include "runtime/thread.hpp"
 #include "runtime/vm_version.hpp"
+#include "utilities/align.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/exceptions.hpp"
 #include "utilities/macros.hpp"
--- old/src/share/vm/runtime/arguments.cpp	2017-07-04 23:39:37.886477727 +0200
+++ new/src/share/vm/runtime/arguments.cpp	2017-07-04 23:39:37.742473020 +0200
@@ -53,6 +53,7 @@
 #include "runtime/vm_version.hpp"
 #include "services/management.hpp"
 #include "services/memTracker.hpp"
+#include "utilities/align.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/stringUtils.hpp"
--- old/src/share/vm/runtime/atomic.hpp	2017-07-04 23:39:38.198487924 +0200
+++ new/src/share/vm/runtime/atomic.hpp	2017-07-04 23:39:38.046482956 +0200
@@ -26,6 +26,7 @@
 #define SHARE_VM_RUNTIME_ATOMIC_HPP
 
 #include "memory/allocation.hpp"
+#include "utilities/align.hpp"
 #include "utilities/macros.hpp"
 
 enum cmpxchg_memory_order {
--- old/src/share/vm/runtime/commandLineFlagConstraintsGC.cpp	2017-07-04 23:39:38.446496029 +0200
+++ new/src/share/vm/runtime/commandLineFlagConstraintsGC.cpp	2017-07-04 23:39:38.294491062 +0200
@@ -33,6 +33,7 @@
 #include "runtime/globals.hpp"
 #include "runtime/globals_extension.hpp"
 #include "runtime/thread.inline.hpp"
+#include "utilities/align.hpp"
 #include "utilities/defaultStream.hpp"
 
 #if INCLUDE_ALL_GCS
--- old/src/share/vm/runtime/globals.hpp	2017-07-04 23:39:38.706504527 +0200
+++ new/src/share/vm/runtime/globals.hpp	2017-07-04 23:39:38.550499429 +0200
@@ -25,11 +25,23 @@
 #ifndef SHARE_VM_RUNTIME_GLOBALS_HPP
 #define SHARE_VM_RUNTIME_GLOBALS_HPP
 
+#include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
 
 #include <float.h> // for DBL_MAX
 
+// The larger HeapWordSize for 64bit requires larger heaps
+// for the same application running in 64bit.  See bug 4967770.
+// The minimum alignment to a heap word size is done.  Other
+// parts of the memory system may require additional alignment
+// and are responsible for those alignments.
+#ifdef _LP64
+#define ScaleForWordSize(x) align_down_((x) * 13 / 10, HeapWordSize)
+#else
+#define ScaleForWordSize(x) (x)
+#endif
+
 // use this for flags that are true per default in the tiered build
 // but false in non-tiered builds, and vice versa
 #ifdef TIERED
--- old/src/share/vm/runtime/icache.cpp	2017-07-04 23:39:39.074516555 +0200
+++ new/src/share/vm/runtime/icache.cpp	2017-07-04 23:39:38.862509627 +0200
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "memory/resourceArea.hpp"
 #include "runtime/icache.hpp"
+#include "utilities/align.hpp"
 
 // The flush stub function address
 AbstractICache::flush_icache_stub_t AbstractICache::_flush_icache_stub = NULL;
--- old/src/share/vm/runtime/jniHandles.cpp	2017-07-04 23:39:39.326524792 +0200
+++ new/src/share/vm/runtime/jniHandles.cpp	2017-07-04 23:39:39.178519955 +0200
@@ -31,6 +31,7 @@
 #include "runtime/jniHandles.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/thread.inline.hpp"
+#include "utilities/align.hpp"
 #if INCLUDE_ALL_GCS
 #include "gc/g1/g1SATBCardTableModRefBS.hpp"
 #endif
--- old/src/share/vm/runtime/os.cpp	2017-07-04 23:39:39.562532506 +0200
+++ new/src/share/vm/runtime/os.cpp	2017-07-04 23:39:39.418527799 +0200
@@ -60,6 +60,7 @@
 #include "services/memTracker.hpp"
 #include "services/nmtCommon.hpp"
 #include "services/threadService.hpp"
+#include "utilities/align.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/events.hpp"
 
--- old/src/share/vm/runtime/perfMemory.cpp	2017-07-04 23:39:39.822541004 +0200
+++ new/src/share/vm/runtime/perfMemory.cpp	2017-07-04 23:39:39.674536166 +0200
@@ -36,6 +36,7 @@
 #include "runtime/perfMemory.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/statSampler.hpp"
+#include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 // Prefix of performance data file.
--- old/src/share/vm/runtime/stubRoutines.cpp	2017-07-04 23:39:40.066548979 +0200
+++ new/src/share/vm/runtime/stubRoutines.cpp	2017-07-04 23:39:39.914544011 +0200
@@ -30,6 +30,7 @@
 #include "runtime/timerTrace.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"
+#include "utilities/align.hpp"
 #include "utilities/copy.hpp"
 #include "utilities/vmError.hpp"
 #ifdef COMPILER2
--- old/src/share/vm/runtime/synchronizer.cpp	2017-07-04 23:39:40.306556822 +0200
+++ new/src/share/vm/runtime/synchronizer.cpp	2017-07-04 23:39:40.166552247 +0200
@@ -44,6 +44,7 @@
 #include "runtime/vframe.hpp"
 #include "trace/traceMacros.hpp"
 #include "trace/tracing.hpp"
+#include "utilities/align.hpp"
 #include "utilities/dtrace.hpp"
 #include "utilities/events.hpp"
 #include "utilities/preserveException.hpp"
--- old/src/share/vm/runtime/thread.cpp	2017-07-04 23:39:40.586565974 +0200
+++ new/src/share/vm/runtime/thread.cpp	2017-07-04 23:39:40.426560745 +0200
@@ -96,6 +96,7 @@
 #include "services/threadService.hpp"
 #include "trace/traceMacros.hpp"
 #include "trace/tracing.hpp"
+#include "utilities/align.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/dtrace.hpp"
 #include "utilities/events.hpp"
--- old/src/share/vm/runtime/thread.hpp	2017-07-04 23:39:40.898576173 +0200
+++ new/src/share/vm/runtime/thread.hpp	2017-07-04 23:39:40.738570943 +0200
@@ -44,6 +44,7 @@
 #include "runtime/unhandledOops.hpp"
 #include "trace/traceBackend.hpp"
 #include "trace/traceMacros.hpp"
+#include "utilities/align.hpp"
 #include "utilities/exceptions.hpp"
 #include "utilities/macros.hpp"
 #if INCLUDE_ALL_GCS
--- old/src/share/vm/services/nmtCommon.hpp	2017-07-04 23:39:41.186585586 +0200
+++ new/src/share/vm/services/nmtCommon.hpp	2017-07-04 23:39:41.022580225 +0200
@@ -26,6 +26,7 @@
 #define SHARE_VM_SERVICES_NMT_COMMON_HPP
 
 #include "memory/allocation.hpp"
+#include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 #define CALC_OBJ_SIZE_IN_TYPE(obj, type) (align_up_(sizeof(obj), sizeof(type))/sizeof(type))
--- old/src/share/vm/utilities/bitMap.hpp	2017-07-04 23:39:41.430593561 +0200
+++ new/src/share/vm/utilities/bitMap.hpp	2017-07-04 23:39:41.282588723 +0200
@@ -26,6 +26,7 @@
 #define SHARE_VM_UTILITIES_BITMAP_HPP
 
 #include "memory/allocation.hpp"
+#include "utilities/align.hpp"
 
 // Forward decl;
 class BitMapClosure;
--- old/src/share/vm/utilities/copy.cpp	2017-07-04 23:39:41.654600882 +0200
+++ new/src/share/vm/utilities/copy.cpp	2017-07-04 23:39:41.522596567 +0200
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "runtime/sharedRuntime.hpp"
+#include "utilities/align.hpp"
 #include "utilities/copy.hpp"
 
 
--- old/src/share/vm/utilities/copy.hpp	2017-07-04 23:39:41.894608725 +0200
+++ new/src/share/vm/utilities/copy.hpp	2017-07-04 23:39:41.746603888 +0200
@@ -26,6 +26,7 @@
 #define SHARE_VM_UTILITIES_COPY_HPP
 
 #include "runtime/stubRoutines.hpp"
+#include "utilities/align.hpp"
 #include "utilities/macros.hpp"
 
 // Assembly code for platforms that need it.
--- old/src/share/vm/utilities/globalDefinitions.hpp	2017-07-04 23:39:42.150617093 +0200
+++ new/src/share/vm/utilities/globalDefinitions.hpp	2017-07-04 23:39:41.986611733 +0200
@@ -200,17 +200,6 @@
 const int HeapWordsPerLong    = BytesPerLong / HeapWordSize;
 const int LogHeapWordsPerLong = LogBytesPerLong - LogHeapWordSize;
 
-// The larger HeapWordSize for 64bit requires larger heaps
-// for the same application running in 64bit.  See bug 4967770.
-// The minimum alignment to a heap word size is done.  Other
-// parts of the memory system may require additional alignment
-// and are responsible for those alignments.
-#ifdef _LP64
-#define ScaleForWordSize(x) align_down_((x) * 13 / 10, HeapWordSize)
-#else
-#define ScaleForWordSize(x) (x)
-#endif
-
 // The minimum number of native machine words necessary to contain "byte_size"
 // bytes.
 inline size_t heap_word_size(size_t byte_size) {
@@ -496,134 +485,6 @@
 const bool support_IRIW_for_not_multiple_copy_atomic_cpu = false;
 #endif
 
-// The byte alignment to be used by Arena::Amalloc.  See bugid 4169348.
-// Note: this value must be a power of 2
-
-#define ARENA_AMALLOC_ALIGNMENT (2*BytesPerWord)
-
-// Signed variants of alignment helpers.  There are two versions of each, a macro
-// for use in places like enum definitions that require compile-time constant
-// expressions and a function for all other places so as to get type checking.
-
-// Using '(what) & ~align_mask(alignment)' to align 'what' down is broken when
-// 'alignment' is an unsigned int and 'what' is a wider type. The & operation
-// will widen the inverted mask, and not sign extend it, leading to a mask with
-// zeros in the most significant bits. The use of align_mask_widened() solves
-// this problem.
-#define align_mask(alignment) ((alignment) - 1)
-#define widen_to_type_of(what, type_carrier) (true ? (what) : (type_carrier))
-#define align_mask_widened(alignment, type_carrier) widen_to_type_of(align_mask(alignment), (type_carrier))
-
-#define align_down_(size, alignment) ((size) & ~align_mask_widened((alignment), (size)))
-
-#define align_up_(size, alignment) (align_down_((size) + align_mask(alignment), (alignment)))
-
-#define is_aligned_(size, alignment) ((size) == (align_up_((size), (alignment))))
-
-// Temporary declaration until this file has been restructured.
-template <typename T>
-bool is_power_of_2_t(T x) {
-  return (x != T(0)) && ((x & (x - 1)) == T(0));
-}
-
-// Helpers to align sizes and check for alignment
-
-template <typename T, typename A>
-inline T align_up(T size, A alignment) {
-  assert(is_power_of_2_t(alignment), "must be a power of 2: " UINT64_FORMAT, (uint64_t)alignment);
-
-  T ret = align_up_(size, alignment);
-  assert(is_aligned_(ret, alignment), "must be aligned: " UINT64_FORMAT, (uint64_t)ret);
-
-  return ret;
-}
-
-template <typename T, typename A>
-inline T align_down(T size, A alignment) {
-  assert(is_power_of_2_t(alignment), "must be a power of 2: " UINT64_FORMAT, (uint64_t)alignment);
-
-  T ret = align_down_(size, alignment);
-  assert(is_aligned_(ret, alignment), "must be aligned: " UINT64_FORMAT, (uint64_t)ret);
-
-  return ret;
-}
-
-template <typename T, typename A>
-inline bool is_aligned(T size, A alignment) {
-  assert(is_power_of_2_t(alignment), "must be a power of 2: " UINT64_FORMAT, (uint64_t)alignment);
-
-  return is_aligned_(size, alignment);
-}
-
-// Align down with a lower bound. If the aligning results in 0, return 'alignment'.
-template <typename T, typename A>
-inline T align_down_bounded(T size, A alignment) {
-  A aligned_size = align_down(size, alignment);
-  return aligned_size > 0 ? aligned_size : alignment;
-}
-
-// Helpers to align pointers and check for alignment.
-
-template <typename T, typename A>
-inline T* align_up(T* ptr, A alignment) {
-  return (T*)align_up((uintptr_t)ptr, alignment);
-}
-
-template <typename T, typename A>
-inline T* align_down(T* ptr, A alignment) {
-  return (T*)align_down((uintptr_t)ptr, alignment);
-}
-
-template <typename T, typename A>
-inline bool is_aligned(T* ptr, A alignment) {
-  return is_aligned((uintptr_t)ptr, alignment);
-}
-
-// Align metaspace objects by rounding up to natural word boundary
-template <typename T>
-inline T align_metadata_size(T size) {
-  return align_up(size, 1);
-}
-
-// Align objects in the Java Heap by rounding up their size, in HeapWord units.
-template <typename T>
-inline T align_object_size(T word_size) {
-  return align_up(word_size, MinObjAlignment);
-}
-
-inline bool is_object_aligned(size_t word_size) {
-  return is_aligned(word_size, MinObjAlignment);
-}
-
-inline bool is_object_aligned(const void* addr) {
-  return is_aligned(addr, MinObjAlignmentInBytes);
-}
-
-// Pad out certain offsets to jlong alignment, in HeapWord units.
-template <typename T>
-inline T align_object_offset(T offset) {
-  return align_up(offset, HeapWordsPerLong);
-}
-
-// Clamp an address to be within a specific page
-// 1. If addr is on the page it is returned as is
-// 2. If addr is above the page_address the start of the *next* page will be returned
-// 3. Otherwise, if addr is below the page_address the start of the page will be returned
-template <typename T>
-inline T* clamp_address_in_page(T* addr, T* page_address, size_t page_size) {
-  if (align_down(addr, page_size) == align_down(page_address, page_size)) {
-    // address is in the specified page, just return it as is
-    return addr;
-  } else if (addr > page_address) {
-    // address is above specified page, return start of next page
-    return align_down(page_address, page_size) + page_size;
-  } else {
-    // address is below specified page, return start of page
-    return align_down(page_address, page_size);
-  }
-}
-
-
 // The expected size in bytes of a cache line, used to pad data structures.
 #ifndef DEFAULT_CACHE_LINE_SIZE
   #define DEFAULT_CACHE_LINE_SIZE 64
--- old/src/share/vm/utilities/stack.inline.hpp	2017-07-04 23:39:42.418625853 +0200
+++ new/src/share/vm/utilities/stack.inline.hpp	2017-07-04 23:39:42.262620753 +0200
@@ -25,6 +25,7 @@
 #ifndef SHARE_VM_UTILITIES_STACK_INLINE_HPP
 #define SHARE_VM_UTILITIES_STACK_INLINE_HPP
 
+#include "utilities/align.hpp"
 #include "utilities/stack.hpp"
 
 template <MEMFLAGS F> StackBase<F>::StackBase(size_t segment_size, size_t max_cache_size,
--- old/test/native/gc/shared/test_collectorPolicy.cpp	2017-07-04 23:39:42.662633828 +0200
+++ new/test/native/gc/shared/test_collectorPolicy.cpp	2017-07-04 23:39:42.514628991 +0200
@@ -25,6 +25,7 @@
 #include "gc/shared/collectorPolicy.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/globals_extension.hpp"
+#include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
 #include "unittest.hpp"
--- old/test/native/memory/test_metachunk.cpp	2017-07-04 23:39:42.922642326 +0200
+++ new/test/native/memory/test_metachunk.cpp	2017-07-04 23:39:42.758636966 +0200
@@ -25,6 +25,7 @@
 #include "memory/allocation.hpp"
 #include "memory/metachunk.hpp"
 #include "unittest.hpp"
+#include "utilities/align.hpp"
 #include "utilities/copy.hpp"
 #include "utilities/debug.hpp"
 
--- old/test/native/runtime/test_arguments.cpp	2017-07-04 23:39:43.174650562 +0200
+++ new/test/native/runtime/test_arguments.cpp	2017-07-04 23:39:43.010645202 +0200
@@ -25,6 +25,7 @@
 #include "prims/jvm.h"
 #include "runtime/arguments.hpp"
 #include "unittest.hpp"
+#include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 class ArgumentsTest : public ::testing::Test {
--- old/test/native/utilities/test_align.cpp	2017-07-04 23:39:43.414658407 +0200
+++ new/test/native/utilities/test_align.cpp	2017-07-04 23:39:43.270653700 +0200
@@ -22,6 +22,7 @@
  */
 
 #include "precompiled.hpp"
+#include "utilities/align.hpp"
 #include "utilities/formatBuffer.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "unittest.hpp"
--- /dev/null	2017-05-29 09:41:13.118409328 +0200
+++ new/src/share/vm/utilities/align.hpp	2017-07-04 23:39:43.506661413 +0200
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 1997, 2017, 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_ALIGN_HPP
+#define SHARE_VM_UTILITIES_ALIGN_HPP
+
+#include "utilities/globalDefinitions.hpp"
+
+// Signed variants of alignment helpers.  There are two versions of each, a macro
+// for use in places like enum definitions that require compile-time constant
+// expressions and a function for all other places so as to get type checking.
+
+// Using '(what) & ~align_mask(alignment)' to align 'what' down is broken when
+// 'alignment' is an unsigned int and 'what' is a wider type. The & operation
+// will widen the inverted mask, and not sign extend it, leading to a mask with
+// zeros in the most significant bits. The use of align_mask_widened() solves
+// this problem.
+#define align_mask(alignment) ((alignment) - 1)
+#define widen_to_type_of(what, type_carrier) (true ? (what) : (type_carrier))
+#define align_mask_widened(alignment, type_carrier) widen_to_type_of(align_mask(alignment), (type_carrier))
+
+#define align_down_(size, alignment) ((size) & ~align_mask_widened((alignment), (size)))
+
+#define align_up_(size, alignment) (align_down_((size) + align_mask(alignment), (alignment)))
+
+#define is_aligned_(size, alignment) ((size) == (align_up_((size), (alignment))))
+
+// Temporary declaration until this file has been restructured.
+template <typename T>
+bool is_power_of_2_t(T x) {
+  return (x != T(0)) && ((x & (x - 1)) == T(0));
+}
+
+// Helpers to align sizes and check for alignment
+
+template <typename T, typename A>
+inline T align_up(T size, A alignment) {
+  assert(is_power_of_2_t(alignment), "must be a power of 2: " UINT64_FORMAT, (uint64_t)alignment);
+
+  T ret = align_up_(size, alignment);
+  assert(is_aligned_(ret, alignment), "must be aligned: " UINT64_FORMAT, (uint64_t)ret);
+
+  return ret;
+}
+
+template <typename T, typename A>
+inline T align_down(T size, A alignment) {
+  assert(is_power_of_2_t(alignment), "must be a power of 2: " UINT64_FORMAT, (uint64_t)alignment);
+
+  T ret = align_down_(size, alignment);
+  assert(is_aligned_(ret, alignment), "must be aligned: " UINT64_FORMAT, (uint64_t)ret);
+
+  return ret;
+}
+
+template <typename T, typename A>
+inline bool is_aligned(T size, A alignment) {
+  assert(is_power_of_2_t(alignment), "must be a power of 2: " UINT64_FORMAT, (uint64_t)alignment);
+
+  return is_aligned_(size, alignment);
+}
+
+// Align down with a lower bound. If the aligning results in 0, return 'alignment'.
+template <typename T, typename A>
+inline T align_down_bounded(T size, A alignment) {
+  A aligned_size = align_down(size, alignment);
+  return aligned_size > 0 ? aligned_size : alignment;
+}
+
+// Helpers to align pointers and check for alignment.
+
+template <typename T, typename A>
+inline T* align_up(T* ptr, A alignment) {
+  return (T*)align_up((uintptr_t)ptr, alignment);
+}
+
+template <typename T, typename A>
+inline T* align_down(T* ptr, A alignment) {
+  return (T*)align_down((uintptr_t)ptr, alignment);
+}
+
+template <typename T, typename A>
+inline bool is_aligned(T* ptr, A alignment) {
+  return is_aligned((uintptr_t)ptr, alignment);
+}
+
+// Align metaspace objects by rounding up to natural word boundary
+template <typename T>
+inline T align_metadata_size(T size) {
+  return align_up(size, 1);
+}
+
+// Align objects in the Java Heap by rounding up their size, in HeapWord units.
+template <typename T>
+inline T align_object_size(T word_size) {
+  return align_up(word_size, MinObjAlignment);
+}
+
+inline bool is_object_aligned(size_t word_size) {
+  return is_aligned(word_size, MinObjAlignment);
+}
+
+inline bool is_object_aligned(const void* addr) {
+  return is_aligned(addr, MinObjAlignmentInBytes);
+}
+
+// Pad out certain offsets to jlong alignment, in HeapWord units.
+template <typename T>
+inline T align_object_offset(T offset) {
+  return align_up(offset, HeapWordsPerLong);
+}
+
+// Clamp an address to be within a specific page
+// 1. If addr is on the page it is returned as is
+// 2. If addr is above the page_address the start of the *next* page will be returned
+// 3. Otherwise, if addr is below the page_address the start of the page will be returned
+template <typename T>
+inline T* clamp_address_in_page(T* addr, T* page_address, size_t page_size) {
+  if (align_down(addr, page_size) == align_down(page_address, page_size)) {
+    // address is in the specified page, just return it as is
+    return addr;
+  } else if (addr > page_address) {
+    // address is above specified page, return start of next page
+    return align_down(page_address, page_size) + page_size;
+  } else {
+    // address is below specified page, return start of page
+    return align_down(page_address, page_size);
+  }
+}
+
+#endif // SHARE_VM_UTILITIES_ALIGN_HPP