*** old/src/share/vm/oops/arrayOop.hpp	Mon May 19 21:13:22 2008
--- new/src/share/vm/oops/arrayOop.hpp	Mon May 19 21:13:22 2008

*** 39,53 ****
--- 39,52 ----
    // Interpreter/Compiler offsets
  
    // 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.
    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;
      if (arrayoopdesc_hs == 0) arrayoopdesc_hs = hs;
      assert(arrayoopdesc_hs == hs, "header size can't change");