comparison src/share/vm/oops/arrayOop.hpp @ 1579:e9ff18c4ace7

Merge
author jrose
date Wed, 02 Jun 2010 22:45:42 -0700
parents c18cbe5936b8 2d127394260e
children f95d63e2154a
comparison
equal deleted inserted replaced
1562:dfe27f03244a 1579:e9ff18c4ace7
90 // Returns the header size in words aligned to the requirements of the 90 // Returns the header size in words aligned to the requirements of the
91 // array object type. 91 // array object type.
92 static int header_size(BasicType type) { 92 static int header_size(BasicType type) {
93 size_t typesize_in_bytes = header_size_in_bytes(); 93 size_t typesize_in_bytes = header_size_in_bytes();
94 return (int)(Universe::element_type_should_be_aligned(type) 94 return (int)(Universe::element_type_should_be_aligned(type)
95 ? align_object_size(typesize_in_bytes/HeapWordSize) 95 ? align_object_offset(typesize_in_bytes/HeapWordSize)
96 : typesize_in_bytes/HeapWordSize); 96 : typesize_in_bytes/HeapWordSize);
97 } 97 }
98 98
99 // Return the maximum length of an array of BasicType. The length can passed 99 // Return the maximum length of an array of BasicType. The length can passed
100 // to typeArrayOop::object_size(scale, length, header_size) without causing an 100 // to typeArrayOop::object_size(scale, length, header_size) without causing an