# HG changeset patch
# User stefank
# Date 1381840340 -7200
# Node ID ec2e26e261837c74c57de3ed93cfde8ffd8fe9da
# Parent  bdfbb1fb19cab10cafe65271298c6749e044b87b
8026392: Metachunks and Metablocks are using a too large alignment
Reviewed-by: coleenp, jmasa

diff -r bdfbb1fb19ca -r ec2e26e26183 src/share/vm/memory/metachunk.cpp
--- a/src/share/vm/memory/metachunk.cpp	Tue Oct 15 14:28:51 2013 +0200
+++ b/src/share/vm/memory/metachunk.cpp	Tue Oct 15 14:32:20 2013 +0200
@@ -33,7 +33,14 @@
 const size_t metadata_chunk_initialize = 0xf7f7f7f7;
 
 size_t Metachunk::object_alignment() {
-  return ARENA_AMALLOC_ALIGNMENT;
+  // Must align pointers and sizes to 8,
+  // so that 64 bit types get correctly aligned.
+  const size_t alignment = 8;
+
+  // Make sure that the Klass alignment also agree.
+  STATIC_ASSERT(alignment == (size_t)KlassAlignmentInBytes);
+
+  return alignment;
 }
 
 size_t Metachunk::overhead() {