# HG changeset patch # User stefank # Date 1499247197 -7200 # Node ID edefffab74e2d2d38d511e304a600e4ee4e05417 # Parent 910fc72c03e81a65253a6c4842f1931c566a442a 8183552: Move align functions to align.hpp Reviewed-by: stuefe, pliden diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/aarch64/vm/abstractInterpreter_aarch64.cpp --- a/hotspot/src/cpu/aarch64/vm/abstractInterpreter_aarch64.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/aarch64/vm/abstractInterpreter_aarch64.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp --- a/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp --- a/hotspot/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/arm/vm/abstractInterpreter_arm.cpp --- a/hotspot/src/cpu/arm/vm/abstractInterpreter_arm.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/arm/vm/abstractInterpreter_arm.cpp Wed Jul 05 11:33:17 2017 +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) { diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/arm/vm/c1_Runtime1_arm.cpp --- a/hotspot/src/cpu/arm/vm/c1_Runtime1_arm.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/arm/vm/c1_Runtime1_arm.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/arm/vm/sharedRuntime_arm.cpp --- a/hotspot/src/cpu/arm/vm/sharedRuntime_arm.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/arm/vm/sharedRuntime_arm.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/arm/vm/stubGenerator_arm.cpp --- a/hotspot/src/cpu/arm/vm/stubGenerator_arm.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/arm/vm/stubGenerator_arm.cpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/arm/vm/templateInterpreterGenerator_arm.cpp --- a/hotspot/src/cpu/arm/vm/templateInterpreterGenerator_arm.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/arm/vm/templateInterpreterGenerator_arm.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/ppc/vm/c1_MacroAssembler_ppc.cpp --- a/hotspot/src/cpu/ppc/vm/c1_MacroAssembler_ppc.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/ppc/vm/c1_MacroAssembler_ppc.cpp Wed Jul 05 11:33:17 2017 +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) { diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/ppc/vm/c1_Runtime1_ppc.cpp --- a/hotspot/src/cpu/ppc/vm/c1_Runtime1_ppc.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/ppc/vm/c1_Runtime1_ppc.cpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/ppc/vm/frame_ppc.inline.hpp --- a/hotspot/src/cpu/ppc/vm/frame_ppc.inline.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/ppc/vm/frame_ppc.inline.hpp Wed Jul 05 11:33:17 2017 +0200 @@ -28,6 +28,7 @@ #include "code/codeCache.hpp" #include "code/vmreg.inline.hpp" +#include "utilities/align.hpp" // Inline functions for ppc64 frames: diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp --- a/hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp --- a/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp Wed Jul 05 11:33:17 2017 +0200 @@ -38,6 +38,7 @@ #include "runtime/stubCodeGenerator.hpp" #include "runtime/stubRoutines.hpp" #include "runtime/thread.inline.hpp" +#include "utilities/align.hpp" #define __ _masm-> diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp --- a/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/s390/vm/c1_CodeStubs_s390.cpp --- a/hotspot/src/cpu/s390/vm/c1_CodeStubs_s390.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/s390/vm/c1_CodeStubs_s390.cpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/s390/vm/frame_s390.inline.hpp --- a/hotspot/src/cpu/s390/vm/frame_s390.inline.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/s390/vm/frame_s390.inline.hpp Wed Jul 05 11:33:17 2017 +0200 @@ -28,6 +28,7 @@ #include "code/codeCache.hpp" #include "code/vmreg.inline.hpp" +#include "utilities/align.hpp" // Inline functions for z/Architecture frames: diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/s390/vm/sharedRuntime_s390.cpp --- a/hotspot/src/cpu/s390/vm/sharedRuntime_s390.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/s390/vm/sharedRuntime_s390.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/sparc/vm/abstractInterpreter_sparc.cpp --- a/hotspot/src/cpu/sparc/vm/abstractInterpreter_sparc.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/sparc/vm/abstractInterpreter_sparc.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp --- a/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/sparc/vm/frame_sparc.inline.hpp --- a/hotspot/src/cpu/sparc/vm/frame_sparc.inline.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/sparc/vm/frame_sparc.inline.hpp Wed Jul 05 11:33:17 2017 +0200 @@ -27,6 +27,7 @@ #include "asm/macroAssembler.hpp" #include "code/vmreg.inline.hpp" +#include "utilities/align.hpp" // Inline functions for SPARC frames: diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/sparc/vm/interp_masm_sparc.cpp --- a/hotspot/src/cpu/sparc/vm/interp_masm_sparc.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/sparc/vm/interp_masm_sparc.cpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/sparc/vm/jvmciCodeInstaller_sparc.cpp --- a/hotspot/src/cpu/sparc/vm/jvmciCodeInstaller_sparc.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/sparc/vm/jvmciCodeInstaller_sparc.cpp Wed Jul 05 11:33:17 2017 +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) { diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/sparc/vm/macroAssembler_sparc.cpp --- a/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/sparc/vm/memset_with_concurrent_readers_sparc.cpp --- a/hotspot/src/cpu/sparc/vm/memset_with_concurrent_readers_sparc.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/sparc/vm/memset_with_concurrent_readers_sparc.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/sparc/vm/sharedRuntime_sparc.cpp --- a/hotspot/src/cpu/sparc/vm/sharedRuntime_sparc.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/sparc/vm/sharedRuntime_sparc.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/sparc/vm/templateInterpreterGenerator_sparc.cpp --- a/hotspot/src/cpu/sparc/vm/templateInterpreterGenerator_sparc.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/sparc/vm/templateInterpreterGenerator_sparc.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/x86/vm/bytes_x86.hpp --- a/hotspot/src/cpu/x86/vm/bytes_x86.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/x86/vm/bytes_x86.hpp Wed Jul 05 11:33:17 2017 +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 { diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp --- a/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp --- a/hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp --- a/hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Wed Jul 05 11:33:17 2017 +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-> diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp --- a/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp Wed Jul 05 11:33:17 2017 +0200 @@ -30,6 +30,7 @@ #include "oops/method.hpp" #include "runtime/thread.hpp" #include "stack_zero.hpp" +#include "utilities/align.hpp" #ifdef CC_INTERP // | ... | diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp --- a/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp Wed Jul 05 11:33:17 2017 +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); diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/zero/vm/stack_zero.cpp --- a/hotspot/src/cpu/zero/vm/stack_zero.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/zero/vm/stack_zero.cpp Wed Jul 05 11:33:17 2017 +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() diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/cpu/zero/vm/stack_zero.hpp --- a/hotspot/src/cpu/zero/vm/stack_zero.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/cpu/zero/vm/stack_zero.hpp Wed Jul 05 11:33:17 2017 +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 { diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/os/aix/vm/misc_aix.cpp --- a/hotspot/src/os/aix/vm/misc_aix.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/os/aix/vm/misc_aix.cpp Wed Jul 05 11:33:17 2017 +0200 @@ -24,6 +24,7 @@ #include "misc_aix.hpp" #include "runtime/stubRoutines.hpp" +#include "utilities/align.hpp" #include #include diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/os/aix/vm/os_aix.cpp --- a/hotspot/src/os/aix/vm/os_aix.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/os/aix/vm/os_aix.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/os/aix/vm/porting_aix.cpp --- a/hotspot/src/os/aix/vm/porting_aix.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/os/aix/vm/porting_aix.cpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/os/bsd/vm/os_bsd.cpp --- a/hotspot/src/os/bsd/vm/os_bsd.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/os/bsd/vm/os_bsd.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/os/linux/vm/os_linux.cpp --- a/hotspot/src/os/linux/vm/os_linux.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/os/linux/vm/os_linux.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/os/posix/vm/os_posix.cpp --- a/hotspot/src/os/posix/vm/os_posix.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/os/posix/vm/os_posix.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/os/solaris/vm/os_solaris.cpp --- a/hotspot/src/os/solaris/vm/os_solaris.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/os/solaris/vm/os_solaris.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/os/windows/vm/os_windows.cpp --- a/hotspot/src/os/windows/vm/os_windows.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/os/windows/vm/os_windows.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp --- a/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp --- a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp --- a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp --- a/hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/asm/codeBuffer.cpp --- a/hotspot/src/share/vm/asm/codeBuffer.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/asm/codeBuffer.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/asm/codeBuffer.hpp --- a/hotspot/src/share/vm/asm/codeBuffer.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/asm/codeBuffer.hpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/c1/c1_FrameMap.cpp --- a/hotspot/src/share/vm/c1/c1_FrameMap.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/c1/c1_FrameMap.cpp Wed Jul 05 11:33:17 2017 +0200 @@ -27,6 +27,7 @@ #include "c1/c1_LIR.hpp" #include "code/vmreg.inline.hpp" #include "runtime/sharedRuntime.hpp" +#include "utilities/align.hpp" //----------------------------------------------------- diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/c1/c1_LinearScan.hpp --- a/hotspot/src/share/vm/c1/c1_LinearScan.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/c1/c1_LinearScan.hpp Wed Jul 05 11:33:17 2017 +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; diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp --- a/hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/classfile/classFileParser.cpp --- a/hotspot/src/share/vm/classfile/classFileParser.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/classfile/classFileParser.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/classfile/javaClasses.cpp --- a/hotspot/src/share/vm/classfile/javaClasses.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/classfile/javaClasses.cpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/classfile/verifier.cpp --- a/hotspot/src/share/vm/classfile/verifier.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/classfile/verifier.cpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/code/codeBlob.cpp --- a/hotspot/src/share/vm/code/codeBlob.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/code/codeBlob.cpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/code/codeBlob.hpp --- a/hotspot/src/share/vm/code/codeBlob.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/code/codeBlob.hpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/code/codeCache.cpp --- a/hotspot/src/share/vm/code/codeCache.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/code/codeCache.cpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/code/exceptionHandlerTable.hpp --- a/hotspot/src/share/vm/code/exceptionHandlerTable.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/code/exceptionHandlerTable.hpp Wed Jul 05 11:33:17 2017 +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), diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/code/icBuffer.hpp --- a/hotspot/src/share/vm/code/icBuffer.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/code/icBuffer.hpp Wed Jul 05 11:33:17 2017 +0200 @@ -29,6 +29,7 @@ #include "code/stubs.hpp" #include "interpreter/bytecodes.hpp" #include "memory/allocation.hpp" +#include "utilities/align.hpp" // // For CompiledIC's: diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/code/nmethod.cpp --- a/hotspot/src/share/vm/code/nmethod.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/code/nmethod.cpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/code/stubs.cpp --- a/hotspot/src/share/vm/code/stubs.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/code/stubs.cpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/code/vtableStubs.cpp --- a/hotspot/src/share/vm/code/vtableStubs.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/code/vtableStubs.cpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/compiler/oopMap.cpp --- a/hotspot/src/share/vm/compiler/oopMap.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/compiler/oopMap.cpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/cms/compactibleFreeListSpace.cpp --- a/hotspot/src/share/vm/gc/cms/compactibleFreeListSpace.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/cms/compactibleFreeListSpace.cpp Wed Jul 05 11:33:17 2017 +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" ///////////////////////////////////////////////////////////////////////// diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp --- a/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.inline.hpp --- a/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.inline.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.inline.hpp Wed Jul 05 11:33:17 2017 +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() { diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/g1/g1AllocRegion.cpp --- a/hotspot/src/share/vm/gc/g1/g1AllocRegion.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/g1/g1AllocRegion.cpp Wed Jul 05 11:33:17 2017 +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; diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/g1/g1Allocator.cpp --- a/hotspot/src/share/vm/gc/g1/g1Allocator.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/g1/g1Allocator.cpp Wed Jul 05 11:33:17 2017 +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), diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/g1/g1CardLiveData.cpp --- a/hotspot/src/share/vm/gc/g1/g1CardLiveData.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/g1/g1CardLiveData.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp --- a/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/g1/g1ConcurrentMark.cpp --- a/hotspot/src/share/vm/gc/g1/g1ConcurrentMark.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/g1/g1ConcurrentMark.cpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/g1/g1PageBasedVirtualSpace.cpp --- a/hotspot/src/share/vm/gc/g1/g1PageBasedVirtualSpace.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/g1/g1PageBasedVirtualSpace.cpp Wed Jul 05 11:33:17 2017 +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) : diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/g1/g1PageBasedVirtualSpace.hpp --- a/hotspot/src/share/vm/gc/g1/g1PageBasedVirtualSpace.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/g1/g1PageBasedVirtualSpace.hpp Wed Jul 05 11:33:17 2017 +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; diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/g1/g1RegionToSpaceMapper.cpp --- a/hotspot/src/share/vm/gc/g1/g1RegionToSpaceMapper.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/g1/g1RegionToSpaceMapper.cpp Wed Jul 05 11:33:17 2017 +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, diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/g1/g1RemSet.cpp --- a/hotspot/src/share/vm/gc/g1/g1RemSet.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/g1/g1RemSet.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/g1/heapRegion.inline.hpp --- a/hotspot/src/share/vm/gc/g1/heapRegion.inline.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/g1/heapRegion.inline.hpp Wed Jul 05 11:33:17 2017 +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, diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/g1/ptrQueue.hpp --- a/hotspot/src/share/vm/gc/g1/ptrQueue.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/g1/ptrQueue.hpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/g1/sparsePRT.hpp --- a/hotspot/src/share/vm/gc/g1/sparsePRT.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/g1/sparsePRT.hpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/parallel/adjoiningGenerations.cpp --- a/hotspot/src/share/vm/gc/parallel/adjoiningGenerations.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/parallel/adjoiningGenerations.cpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/parallel/asPSOldGen.cpp --- a/hotspot/src/share/vm/gc/parallel/asPSOldGen.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/parallel/asPSOldGen.cpp Wed Jul 05 11:33:17 2017 +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, diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/parallel/asPSYoungGen.cpp --- a/hotspot/src/share/vm/gc/parallel/asPSYoungGen.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/parallel/asPSYoungGen.cpp Wed Jul 05 11:33:17 2017 +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, diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/parallel/cardTableExtension.cpp --- a/hotspot/src/share/vm/gc/parallel/cardTableExtension.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/parallel/cardTableExtension.cpp Wed Jul 05 11:33:17 2017 +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. diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/parallel/generationSizer.cpp --- a/hotspot/src/share/vm/gc/parallel/generationSizer.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/parallel/generationSizer.cpp Wed Jul 05 11:33:17 2017 +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() { diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/parallel/mutableNUMASpace.cpp --- a/hotspot/src/share/vm/gc/parallel/mutableNUMASpace.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/parallel/mutableNUMASpace.cpp Wed Jul 05 11:33:17 2017 +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(0, true); diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/parallel/mutableSpace.cpp --- a/hotspot/src/share/vm/gc/parallel/mutableSpace.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/parallel/mutableSpace.cpp Wed Jul 05 11:33:17 2017 +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) { diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/parallel/objectStartArray.cpp --- a/hotspot/src/share/vm/gc/parallel/objectStartArray.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/parallel/objectStartArray.cpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/parallel/parMarkBitMap.cpp --- a/hotspot/src/share/vm/gc/parallel/parMarkBitMap.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/parallel/parMarkBitMap.cpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/parallel/psAdaptiveSizePolicy.cpp --- a/hotspot/src/share/vm/gc/parallel/psAdaptiveSizePolicy.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/parallel/psAdaptiveSizePolicy.cpp Wed Jul 05 11:33:17 2017 +0200 @@ -32,6 +32,7 @@ #include "gc/shared/gcPolicyCounters.hpp" #include "logging/log.hpp" #include "runtime/timer.hpp" +#include "utilities/align.hpp" #include diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/parallel/psAdaptiveSizePolicy.hpp --- a/hotspot/src/share/vm/gc/parallel/psAdaptiveSizePolicy.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/parallel/psAdaptiveSizePolicy.hpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/parallel/psMarkSweep.cpp --- a/hotspot/src/share/vm/gc/parallel/psMarkSweep.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/parallel/psMarkSweep.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/parallel/psOldGen.cpp --- a/hotspot/src/share/vm/gc/parallel/psOldGen.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/parallel/psOldGen.cpp Wed Jul 05 11:33:17 2017 +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"; diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/parallel/psParallelCompact.cpp --- a/hotspot/src/share/vm/gc/parallel/psParallelCompact.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/parallel/psParallelCompact.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/parallel/psPromotionLAB.inline.hpp --- a/hotspot/src/share/vm/gc/parallel/psPromotionLAB.inline.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/parallel/psPromotionLAB.inline.hpp Wed Jul 05 11:33:17 2017 +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. diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/parallel/psYoungGen.cpp --- a/hotspot/src/share/vm/gc/parallel/psYoungGen.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/parallel/psYoungGen.cpp Wed Jul 05 11:33:17 2017 +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, diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/serial/defNewGeneration.cpp --- a/hotspot/src/share/vm/gc/serial/defNewGeneration.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/serial/defNewGeneration.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/serial/defNewGeneration.hpp --- a/hotspot/src/share/vm/gc/serial/defNewGeneration.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/serial/defNewGeneration.hpp Wed Jul 05 11:33:17 2017 +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; diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/shared/barrierSet.inline.hpp --- a/hotspot/src/share/vm/gc/shared/barrierSet.inline.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/shared/barrierSet.inline.hpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/shared/cardTableModRefBS.cpp --- a/hotspot/src/share/vm/gc/shared/cardTableModRefBS.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/shared/cardTableModRefBS.cpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/shared/cardTableModRefBS.hpp --- a/hotspot/src/share/vm/gc/shared/cardTableModRefBS.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/shared/cardTableModRefBS.hpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/shared/collectedHeap.cpp --- a/hotspot/src/share/vm/gc/shared/collectedHeap.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/shared/collectedHeap.cpp Wed Jul 05 11:33:17 2017 +0200 @@ -41,6 +41,7 @@ #include "runtime/init.hpp" #include "runtime/thread.inline.hpp" #include "services/heapDumper.hpp" +#include "utilities/align.hpp" #ifdef ASSERT diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/shared/collectedHeap.inline.hpp --- a/hotspot/src/share/vm/gc/shared/collectedHeap.inline.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/shared/collectedHeap.inline.hpp Wed Jul 05 11:33:17 2017 +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. diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/shared/collectorPolicy.cpp --- a/hotspot/src/share/vm/gc/shared/collectorPolicy.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/shared/collectorPolicy.cpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/shared/generationSpec.hpp --- a/hotspot/src/share/vm/gc/shared/generationSpec.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/shared/generationSpec.hpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/shared/space.cpp --- a/hotspot/src/share/vm/gc/shared/space.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/shared/space.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/gc/shared/space.hpp --- a/hotspot/src/share/vm/gc/shared/space.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/gc/shared/space.hpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/interpreter/bytecode.hpp --- a/hotspot/src/share/vm/interpreter/bytecode.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/interpreter/bytecode.hpp Wed Jul 05 11:33:17 2017 +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; diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/interpreter/bytecodeTracer.cpp --- a/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/interpreter/bytecodes.cpp --- a/hotspot/src/share/vm/interpreter/bytecodes.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/interpreter/bytecodes.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/interpreter/interpreter.hpp --- a/hotspot/src/share/vm/interpreter/interpreter.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/interpreter/interpreter.hpp Wed Jul 05 11:33:17 2017 +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. diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/interpreter/interpreterRuntime.cpp --- a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/jvmci/jvmciCodeInstaller.cpp --- a/hotspot/src/share/vm/jvmci/jvmciCodeInstaller.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/jvmci/jvmciCodeInstaller.cpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/memory/allocation.hpp --- a/hotspot/src/share/vm/memory/allocation.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/memory/allocation.hpp Wed Jul 05 11:33:17 2017 +0200 @@ -37,6 +37,11 @@ #include +// 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) diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/memory/allocation.inline.hpp --- a/hotspot/src/share/vm/memory/allocation.inline.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/memory/allocation.inline.hpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/memory/filemap.cpp --- a/hotspot/src/share/vm/memory/filemap.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/memory/filemap.cpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/memory/filemap.hpp --- a/hotspot/src/share/vm/memory/filemap.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/memory/filemap.hpp Wed Jul 05 11:33:17 2017 +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. diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/memory/heap.cpp --- a/hotspot/src/share/vm/memory/heap.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/memory/heap.cpp Wed Jul 05 11:33:17 2017 +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); diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/memory/metachunk.cpp --- a/hotspot/src/share/vm/memory/metachunk.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/memory/metachunk.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/memory/metaspace.cpp --- a/hotspot/src/share/vm/memory/metaspace.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/memory/metaspace.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/memory/metaspaceShared.cpp --- a/hotspot/src/share/vm/memory/metaspaceShared.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/memory/metaspaceShared.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/memory/padded.hpp --- a/hotspot/src/share/vm/memory/padded.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/memory/padded.hpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/memory/padded.inline.hpp --- a/hotspot/src/share/vm/memory/padded.inline.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/memory/padded.inline.hpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/memory/universe.cpp --- a/hotspot/src/share/vm/memory/universe.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/memory/universe.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/memory/virtualspace.cpp --- a/hotspot/src/share/vm/memory/virtualspace.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/memory/virtualspace.cpp Wed Jul 05 11:33:17 2017 +0200 @@ -29,6 +29,7 @@ #include "oops/markOop.hpp" #include "oops/oop.inline.hpp" #include "services/memTracker.hpp" +#include "utilities/align.hpp" // ReservedSpace diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/oops/array.hpp --- a/hotspot/src/share/vm/oops/array.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/oops/array.hpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/oops/arrayOop.hpp --- a/hotspot/src/share/vm/oops/arrayOop.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/oops/arrayOop.hpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/oops/constMethod.cpp --- a/hotspot/src/share/vm/oops/constMethod.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/oops/constMethod.cpp Wed Jul 05 11:33:17 2017 +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; diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/oops/constMethod.hpp --- a/hotspot/src/share/vm/oops/constMethod.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/oops/constMethod.hpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/oops/constantPool.hpp --- a/hotspot/src/share/vm/oops/constantPool.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/oops/constantPool.hpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/oops/cpCache.hpp --- a/hotspot/src/share/vm/oops/cpCache.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/oops/cpCache.hpp Wed Jul 05 11:33:17 2017 +0200 @@ -29,6 +29,7 @@ #include "memory/allocation.hpp" #include "oops/array.hpp" #include "runtime/orderAccess.hpp" +#include "utilities/align.hpp" class PSPromotionManager; diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/oops/instanceKlass.hpp --- a/hotspot/src/share/vm/oops/instanceKlass.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/oops/instanceKlass.hpp Wed Jul 05 11:33:17 2017 +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. diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/oops/method.cpp --- a/hotspot/src/share/vm/oops/method.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/oops/method.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/oops/method.hpp --- a/hotspot/src/share/vm/oops/method.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/oops/method.hpp Wed Jul 05 11:33:17 2017 +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. diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/oops/methodCounters.hpp --- a/hotspot/src/share/vm/oops/methodCounters.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/oops/methodCounters.hpp Wed Jul 05 11:33:17 2017 +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; diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/oops/methodData.cpp --- a/hotspot/src/share/vm/oops/methodData.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/oops/methodData.cpp Wed Jul 05 11:33:17 2017 +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" // ================================================================== diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/oops/methodData.hpp --- a/hotspot/src/share/vm/oops/methodData.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/oops/methodData.hpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/oops/objArrayOop.hpp --- a/hotspot/src/share/vm/oops/objArrayOop.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/oops/objArrayOop.hpp Wed Jul 05 11:33:17 2017 +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. diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/oops/oop.inline.hpp --- a/hotspot/src/share/vm/oops/oop.inline.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/oops/oop.inline.hpp Wed Jul 05 11:33:17 2017 +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) { diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/opto/buildOopMap.cpp --- a/hotspot/src/share/vm/opto/buildOopMap.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/opto/buildOopMap.cpp Wed Jul 05 11:33:17 2017 +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. // diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/opto/chaitin.cpp --- a/hotspot/src/share/vm/opto/chaitin.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/opto/chaitin.cpp Wed Jul 05 11:33:17 2017 +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 { diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/opto/compile.cpp --- a/hotspot/src/share/vm/opto/compile.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/opto/compile.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/opto/macroArrayCopy.cpp --- a/hotspot/src/share/vm/opto/macroArrayCopy.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/opto/macroArrayCopy.cpp Wed Jul 05 11:33:17 2017 +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) { diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/opto/matcher.cpp --- a/hotspot/src/share/vm/opto/matcher.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/opto/matcher.cpp Wed Jul 05 11:33:17 2017 +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; diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/opto/memnode.cpp --- a/hotspot/src/share/vm/opto/memnode.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/opto/memnode.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/prims/unsafe.cpp --- a/hotspot/src/share/vm/prims/unsafe.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/prims/unsafe.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/prims/whitebox.cpp --- a/hotspot/src/share/vm/prims/whitebox.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/prims/whitebox.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/runtime/arguments.cpp --- a/hotspot/src/share/vm/runtime/arguments.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/runtime/arguments.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/runtime/atomic.hpp --- a/hotspot/src/share/vm/runtime/atomic.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/runtime/atomic.hpp Wed Jul 05 11:33:17 2017 +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 { diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/runtime/commandLineFlagConstraintsGC.cpp --- a/hotspot/src/share/vm/runtime/commandLineFlagConstraintsGC.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/runtime/commandLineFlagConstraintsGC.cpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/runtime/globals.hpp --- a/hotspot/src/share/vm/runtime/globals.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/runtime/globals.hpp Wed Jul 05 11:33:17 2017 +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 // 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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/runtime/icache.cpp --- a/hotspot/src/share/vm/runtime/icache.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/runtime/icache.cpp Wed Jul 05 11:33:17 2017 +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; diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/runtime/jniHandles.cpp --- a/hotspot/src/share/vm/runtime/jniHandles.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/runtime/jniHandles.cpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/runtime/os.cpp --- a/hotspot/src/share/vm/runtime/os.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/runtime/os.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/runtime/perfMemory.cpp --- a/hotspot/src/share/vm/runtime/perfMemory.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/runtime/perfMemory.cpp Wed Jul 05 11:33:17 2017 +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. diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/runtime/stubRoutines.cpp --- a/hotspot/src/share/vm/runtime/stubRoutines.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/runtime/stubRoutines.cpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/runtime/synchronizer.cpp --- a/hotspot/src/share/vm/runtime/synchronizer.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/runtime/synchronizer.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/runtime/thread.cpp --- a/hotspot/src/share/vm/runtime/thread.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/runtime/thread.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/runtime/thread.hpp --- a/hotspot/src/share/vm/runtime/thread.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/runtime/thread.hpp Wed Jul 05 11:33:17 2017 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/services/nmtCommon.hpp --- a/hotspot/src/share/vm/services/nmtCommon.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/services/nmtCommon.hpp Wed Jul 05 11:33:17 2017 +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)) diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/utilities/align.hpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hotspot/src/share/vm/utilities/align.hpp Wed Jul 05 11:33:17 2017 +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 +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 +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 +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 +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 +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 +inline T* align_up(T* ptr, A alignment) { + return (T*)align_up((uintptr_t)ptr, alignment); +} + +template +inline T* align_down(T* ptr, A alignment) { + return (T*)align_down((uintptr_t)ptr, alignment); +} + +template +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 +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 +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 +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 +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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/utilities/bitMap.hpp --- a/hotspot/src/share/vm/utilities/bitMap.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/utilities/bitMap.hpp Wed Jul 05 11:33:17 2017 +0200 @@ -26,6 +26,7 @@ #define SHARE_VM_UTILITIES_BITMAP_HPP #include "memory/allocation.hpp" +#include "utilities/align.hpp" // Forward decl; class BitMapClosure; diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/utilities/copy.cpp --- a/hotspot/src/share/vm/utilities/copy.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/utilities/copy.cpp Wed Jul 05 11:33:17 2017 +0200 @@ -24,6 +24,7 @@ #include "precompiled.hpp" #include "runtime/sharedRuntime.hpp" +#include "utilities/align.hpp" #include "utilities/copy.hpp" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/utilities/copy.hpp --- a/hotspot/src/share/vm/utilities/copy.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/utilities/copy.hpp Wed Jul 05 11:33:17 2017 +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. diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/utilities/globalDefinitions.hpp --- a/hotspot/src/share/vm/utilities/globalDefinitions.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/utilities/globalDefinitions.hpp Wed Jul 05 11:33:17 2017 +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 -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 -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 -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 -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 -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 -inline T* align_up(T* ptr, A alignment) { - return (T*)align_up((uintptr_t)ptr, alignment); -} - -template -inline T* align_down(T* ptr, A alignment) { - return (T*)align_down((uintptr_t)ptr, alignment); -} - -template -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 -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 -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 -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 -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 diff -r 910fc72c03e8 -r edefffab74e2 hotspot/src/share/vm/utilities/stack.inline.hpp --- a/hotspot/src/share/vm/utilities/stack.inline.hpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/src/share/vm/utilities/stack.inline.hpp Wed Jul 05 11:33:17 2017 +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 StackBase::StackBase(size_t segment_size, size_t max_cache_size, diff -r 910fc72c03e8 -r edefffab74e2 hotspot/test/native/gc/shared/test_collectorPolicy.cpp --- a/hotspot/test/native/gc/shared/test_collectorPolicy.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/test/native/gc/shared/test_collectorPolicy.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/test/native/memory/test_metachunk.cpp --- a/hotspot/test/native/memory/test_metachunk.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/test/native/memory/test_metachunk.cpp Wed Jul 05 11:33:17 2017 +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" diff -r 910fc72c03e8 -r edefffab74e2 hotspot/test/native/runtime/test_arguments.cpp --- a/hotspot/test/native/runtime/test_arguments.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/test/native/runtime/test_arguments.cpp Wed Jul 05 11:33:17 2017 +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 { diff -r 910fc72c03e8 -r edefffab74e2 hotspot/test/native/utilities/test_align.cpp --- a/hotspot/test/native/utilities/test_align.cpp Mon Apr 24 09:14:09 2017 +0200 +++ b/hotspot/test/native/utilities/test_align.cpp Wed Jul 05 11:33:17 2017 +0200 @@ -22,6 +22,7 @@ */ #include "precompiled.hpp" +#include "utilities/align.hpp" #include "utilities/formatBuffer.hpp" #include "utilities/globalDefinitions.hpp" #include "unittest.hpp"