< prev index next >
src/hotspot/share/oops/objArrayKlass.cpp
Print this page
*** 53,79 ****
int size = ArrayKlass::static_size(ObjArrayKlass::header_size());
return new (loader_data, size, THREAD) ObjArrayKlass(n, k, name);
}
! Klass* ObjArrayKlass::allocate_objArray_klass(ClassLoaderData* loader_data,
int n, Klass* element_klass, TRAPS) {
-
// Eagerly allocate the direct array supertype.
Klass* super_klass = NULL;
if (!Universe::is_bootstrapping() || SystemDictionary::Object_klass_loaded()) {
Klass* element_super = element_klass->super();
if (element_super != NULL) {
// The element type has a direct super. E.g., String[] has direct super of Object[].
! super_klass = element_super->array_klass_or_null();
bool supers_exist = super_klass != NULL;
// Also, see if the element has secondary supertypes.
// We need an array type for each.
const Array<Klass*>* element_supers = element_klass->secondary_supers();
for( int i = element_supers->length()-1; i >= 0; i-- ) {
Klass* elem_super = element_supers->at(i);
! if (elem_super->array_klass_or_null() == NULL) {
supers_exist = false;
break;
}
}
if (!supers_exist) {
--- 53,78 ----
int size = ArrayKlass::static_size(ObjArrayKlass::header_size());
return new (loader_data, size, THREAD) ObjArrayKlass(n, k, name);
}
! Klass* ObjArrayKlass::allocate_objArray_klass(ArrayStorageProperties storage_props,
int n, Klass* element_klass, TRAPS) {
// Eagerly allocate the direct array supertype.
Klass* super_klass = NULL;
if (!Universe::is_bootstrapping() || SystemDictionary::Object_klass_loaded()) {
Klass* element_super = element_klass->super();
if (element_super != NULL) {
// The element type has a direct super. E.g., String[] has direct super of Object[].
! super_klass = element_super->array_klass_or_null(storage_props);
bool supers_exist = super_klass != NULL;
// Also, see if the element has secondary supertypes.
// We need an array type for each.
const Array<Klass*>* element_supers = element_klass->secondary_supers();
for( int i = element_supers->length()-1; i >= 0; i-- ) {
Klass* elem_super = element_supers->at(i);
! if (elem_super->array_klass_or_null(ArrayStorageProperties::empty) == NULL) {
supers_exist = false;
break;
}
}
if (!supers_exist) {
*** 85,108 ****
for( int i = element_supers->length()-1; i >= 0; i-- ) {
Klass* elem_super = element_supers->at(i);
elem_super->array_klass(CHECK_0);
}
// Now retry from the beginning
! ek = element_klass->array_klass(n, CHECK_0);
} // re-lock
return ek;
}
} else {
// The element type is already Object. Object[] has direct super of Object.
super_klass = SystemDictionary::Object_klass();
}
}
// Create type name for klass.
! Symbol* name = ArrayKlass::create_element_klass_array_name(element_klass, CHECK_NULL);
// Initialize instance variables
ObjArrayKlass* oak = ObjArrayKlass::allocate(loader_data, n, element_klass, name, CHECK_0);
// Add all classes to our internal class loader list here,
// including classes in the bootstrap (NULL) class loader.
// GC walks these as strong roots.
--- 84,108 ----
for( int i = element_supers->length()-1; i >= 0; i-- ) {
Klass* elem_super = element_supers->at(i);
elem_super->array_klass(CHECK_0);
}
// Now retry from the beginning
! ek = element_klass->array_klass(storage_props, n, CHECK_0);
} // re-lock
return ek;
}
} else {
// The element type is already Object. Object[] has direct super of Object.
super_klass = SystemDictionary::Object_klass();
}
}
// Create type name for klass.
! Symbol* name = ArrayKlass::create_element_klass_array_name(storage_props.is_null_free(), element_klass, CHECK_NULL);
// Initialize instance variables
+ ClassLoaderData* loader_data = element_klass->class_loader_data();
ObjArrayKlass* oak = ObjArrayKlass::allocate(loader_data, n, element_klass, name, CHECK_0);
// Add all classes to our internal class loader list here,
// including classes in the bootstrap (NULL) class loader.
// GC walks these as strong roots.
*** 149,168 ****
}
objArrayOop ObjArrayKlass::allocate(int length, TRAPS) {
check_array_allocation_length(length, arrayOopDesc::max_array_length(T_OBJECT), CHECK_0);
int size = objArrayOopDesc::object_size(length);
! return (objArrayOop)Universe::heap()->array_allocate(this, size, length,
/* do_zero */ true, THREAD);
}
static int multi_alloc_counter = 0;
oop ObjArrayKlass::multi_allocate(int rank, jint* sizes, TRAPS) {
int length = *sizes;
! if (rank == 1) { // last dim may be valueArray
! return oopFactory::new_array(element_klass(), length, CHECK_NULL);
}
guarantee(rank > 1, "Rank below 1");
// Call to lower_dimension uses this pointer, so most be called before a
// possible GC
Klass* ld_klass = lower_dimension();
--- 149,183 ----
}
objArrayOop ObjArrayKlass::allocate(int length, TRAPS) {
check_array_allocation_length(length, arrayOopDesc::max_array_length(T_OBJECT), CHECK_0);
int size = objArrayOopDesc::object_size(length);
! bool populate_null_free = storage_properties().is_null_free() && (dimension() == 1);
! objArrayOop array = (objArrayOop)Universe::heap()->array_allocate(this, size, length,
/* do_zero */ true, THREAD);
+ if (populate_null_free) {
+ assert(!element_klass()->is_array_klass(), "ArrayKlass unexpected here");
+ // Populate default values...
+ objArrayHandle array_h(THREAD, array);
+ instanceOop value = (instanceOop) ValueKlass::cast(element_klass())->default_value();
+ for (int i = 0; i < length; i++) {
+ array_h->obj_at_put(i, value);
+ }
+ }
+ return array;
}
static int multi_alloc_counter = 0;
oop ObjArrayKlass::multi_allocate(int rank, jint* sizes, TRAPS) {
int length = *sizes;
! if (rank == 1) { // last dim may be valueArray, check if we have any special storage requirements
! if ((!element_klass()->is_array_klass()) && storage_properties().is_null_free()) {
! return oopFactory::new_valueArray(element_klass(), length, CHECK_NULL);
! } else {
! return oopFactory::new_objArray(element_klass(), length, CHECK_NULL);
! }
}
guarantee(rank > 1, "Rank below 1");
// Call to lower_dimension uses this pointer, so most be called before a
// possible GC
Klass* ld_klass = lower_dimension();
*** 187,196 ****
--- 202,215 ----
}
}
return h_array();
}
+ ArrayStorageProperties ObjArrayKlass::storage_properties() {
+ return name()->is_Q_array_signature() ? ArrayStorageProperties::null_free : ArrayStorageProperties::empty;
+ }
+
// Either oop or narrowOop depending on UseCompressedOops.
void ObjArrayKlass::do_copy(arrayOop s, size_t src_offset,
arrayOop d, size_t dst_offset, int length, TRAPS) {
if (oopDesc::equals(s, d)) {
// since source and destination are equal we do not need conversion checks.
*** 324,335 ****
do_copy(s, src_offset, d, dst_offset, length, CHECK);
}
}
! Klass* ObjArrayKlass::array_klass_impl(bool or_null, int n, TRAPS) {
!
assert(dimension() <= n, "check order of chain");
int dim = dimension();
if (dim == n) return this;
// lock-free read needs acquire semantics
--- 343,354 ----
do_copy(s, src_offset, d, dst_offset, length, CHECK);
}
}
! Klass* ObjArrayKlass::array_klass_impl(ArrayStorageProperties storage_props, bool or_null, int n, TRAPS) {
! assert(!storage_props.is_flattened() || n > 1, "Cannot flatten");
assert(dimension() <= n, "check order of chain");
int dim = dimension();
if (dim == n) return this;
// lock-free read needs acquire semantics
*** 345,355 ****
// Check if another thread beat us
if (higher_dimension() == NULL) {
// Create multi-dim klass object and link them together
Klass* k =
! ObjArrayKlass::allocate_objArray_klass(class_loader_data(), dim + 1, this, CHECK_NULL);
ObjArrayKlass* ak = ObjArrayKlass::cast(k);
ak->set_lower_dimension(this);
// use 'release' to pair with lock-free load
release_set_higher_dimension(ak);
assert(ak->is_objArray_klass(), "incorrect initialization of ObjArrayKlass");
--- 364,374 ----
// Check if another thread beat us
if (higher_dimension() == NULL) {
// Create multi-dim klass object and link them together
Klass* k =
! ObjArrayKlass::allocate_objArray_klass(storage_props, dim + 1, this, CHECK_NULL);
ObjArrayKlass* ak = ObjArrayKlass::cast(k);
ak->set_lower_dimension(this);
// use 'release' to pair with lock-free load
release_set_higher_dimension(ak);
assert(ak->is_objArray_klass(), "incorrect initialization of ObjArrayKlass");
*** 359,375 ****
CHECK_UNHANDLED_OOPS_ONLY(Thread::current()->clear_unhandled_oops());
}
ObjArrayKlass *ak = ObjArrayKlass::cast(higher_dimension());
if (or_null) {
! return ak->array_klass_or_null(n);
}
! return ak->array_klass(n, THREAD);
}
! Klass* ObjArrayKlass::array_klass_impl(bool or_null, TRAPS) {
! return array_klass_impl(or_null, dimension() + 1, THREAD);
}
bool ObjArrayKlass::can_be_primary_super_slow() const {
if (!bottom_klass()->can_be_primary_super())
// array of interfaces
--- 378,394 ----
CHECK_UNHANDLED_OOPS_ONLY(Thread::current()->clear_unhandled_oops());
}
ObjArrayKlass *ak = ObjArrayKlass::cast(higher_dimension());
if (or_null) {
! return ak->array_klass_or_null(storage_props, n);
}
! return ak->array_klass(storage_props, n, THREAD);
}
! Klass* ObjArrayKlass::array_klass_impl(ArrayStorageProperties storage_props, bool or_null, TRAPS) {
! return array_klass_impl(storage_props, or_null, dimension() + 1, THREAD);
}
bool ObjArrayKlass::can_be_primary_super_slow() const {
if (!bottom_klass()->can_be_primary_super())
// array of interfaces
*** 393,403 ****
GrowableArray<Klass*>* secondaries = new GrowableArray<Klass*>(num_elem_supers+2);
secondaries->push(SystemDictionary::Cloneable_klass());
secondaries->push(SystemDictionary::Serializable_klass());
for (int i = 0; i < num_elem_supers; i++) {
Klass* elem_super = elem_supers->at(i);
! Klass* array_super = elem_super->array_klass_or_null();
assert(array_super != NULL, "must already have been created");
secondaries->push(array_super);
}
return secondaries;
}
--- 412,422 ----
GrowableArray<Klass*>* secondaries = new GrowableArray<Klass*>(num_elem_supers+2);
secondaries->push(SystemDictionary::Cloneable_klass());
secondaries->push(SystemDictionary::Serializable_klass());
for (int i = 0; i < num_elem_supers; i++) {
Klass* elem_super = elem_supers->at(i);
! Klass* array_super = elem_super->array_klass_or_null(ArrayStorageProperties::empty);
assert(array_super != NULL, "must already have been created");
secondaries->push(array_super);
}
return secondaries;
}
< prev index next >