diff -r 0e4c848d5c06 -r 201c5cde25bb hotspot/src/share/vm/oops/arrayOop.hpp
--- a/hotspot/src/share/vm/oops/arrayOop.hpp	Tue Jun 01 11:48:33 2010 -0700
+++ b/hotspot/src/share/vm/oops/arrayOop.hpp	Wed Jun 02 22:45:42 2010 -0700
@@ -92,7 +92,7 @@
   static int header_size(BasicType type) {
     size_t typesize_in_bytes = header_size_in_bytes();
     return (int)(Universe::element_type_should_be_aligned(type)
-      ? align_object_size(typesize_in_bytes/HeapWordSize)
+      ? align_object_offset(typesize_in_bytes/HeapWordSize)
       : typesize_in_bytes/HeapWordSize);
   }