Mercurial > hg > graal-jvmci-8
diff src/share/vm/oops/arrayOop.hpp @ 344:6aae2f9d0294
Merge
author | ysr |
---|---|
date | Thu, 12 Jun 2008 13:50:55 -0700 |
parents | 437d03ea40b1 |
children | d1605aabd0a1 |
line wrap: on
line diff
--- a/src/share/vm/oops/arrayOop.hpp Thu Jun 05 15:57:56 2008 -0700 +++ b/src/share/vm/oops/arrayOop.hpp Thu Jun 12 13:50:55 2008 -0700 @@ -41,11 +41,10 @@ // Header size computation. // The header is considered the oop part of this type plus the length. // Returns the aligned header_size_in_bytes. This is not equivalent to - // sizeof(arrayOopDesc) which should not appear in the code, except here. + // sizeof(arrayOopDesc) which should not appear in the code. static int header_size_in_bytes() { - size_t hs = UseCompressedOops ? - sizeof(arrayOopDesc) : - align_size_up(sizeof(arrayOopDesc) + sizeof(int), HeapWordSize); + size_t hs = align_size_up(length_offset_in_bytes() + sizeof(int), + HeapWordSize); #ifdef ASSERT // make sure it isn't called before UseCompressedOops is initialized. static size_t arrayoopdesc_hs = 0;