src/share/vm/oops/arrayOop.hpp

*** 48,58 ****
    // 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.
    static int header_size_in_bytes() {
!     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;
--- 48,58 ----
    // 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.
    static int header_size_in_bytes() {
!     size_t hs = align_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;
*** 110,128 ****
    static int32_t max_array_length(BasicType type) {
      assert(type >= 0 && type < T_CONFLICT, "wrong type");
      assert(type2aelembytes(type) != 0, "wrong type");
  
      const size_t max_element_words_per_size_t =
!       align_size_down((SIZE_MAX/HeapWordSize - header_size(type)), MinObjAlignment);
      const size_t max_elements_per_size_t =
        HeapWordSize * max_element_words_per_size_t / type2aelembytes(type);
      if ((size_t)max_jint < max_elements_per_size_t) {
        // It should be ok to return max_jint here, but parts of the code
        // (CollectedHeap, Klass::oop_oop_iterate(), and more) uses an int for
        // passing around the size (in words) of an object. So, we need to avoid
        // overflowing an int when we add the header. See CRs 4718400 and 7110613.
!       return align_size_down(max_jint - header_size(type), MinObjAlignment);
      }
      return (int32_t)max_elements_per_size_t;
    }
  
  };
--- 110,128 ----
    static int32_t max_array_length(BasicType type) {
      assert(type >= 0 && type < T_CONFLICT, "wrong type");
      assert(type2aelembytes(type) != 0, "wrong type");
  
      const size_t max_element_words_per_size_t =
!       align_down((SIZE_MAX/HeapWordSize - header_size(type)), MinObjAlignment);
      const size_t max_elements_per_size_t =
        HeapWordSize * max_element_words_per_size_t / type2aelembytes(type);
      if ((size_t)max_jint < max_elements_per_size_t) {
        // It should be ok to return max_jint here, but parts of the code
        // (CollectedHeap, Klass::oop_oop_iterate(), and more) uses an int for
        // passing around the size (in words) of an object. So, we need to avoid
        // overflowing an int when we add the header. See CRs 4718400 and 7110613.
!       return align_down(max_jint - header_size(type), MinObjAlignment);
      }
      return (int32_t)max_elements_per_size_t;
    }
  
  };