comparison src/share/vm/oops/objArrayKlass.cpp @ 1144:9b9c1ee9b3f6

Merge
author iveresov
date Wed, 06 Jan 2010 22:21:39 -0800
parents 4ce7240d622c
children 4e6abf09f540
comparison
equal deleted inserted replaced
1129:a5a6adfca6ec 1144:9b9c1ee9b3f6
244 // Must share this for correct bootstrapping! 244 // Must share this for correct bootstrapping!
245 return Universe::the_array_interfaces_array(); 245 return Universe::the_array_interfaces_array();
246 } else { 246 } else {
247 objArrayOop sec_oop = oopFactory::new_system_objArray(num_secondaries, CHECK_NULL); 247 objArrayOop sec_oop = oopFactory::new_system_objArray(num_secondaries, CHECK_NULL);
248 objArrayHandle secondaries(THREAD, sec_oop); 248 objArrayHandle secondaries(THREAD, sec_oop);
249 secondaries->obj_at_put(num_extra_slots+0, SystemDictionary::cloneable_klass()); 249 secondaries->obj_at_put(num_extra_slots+0, SystemDictionary::Cloneable_klass());
250 secondaries->obj_at_put(num_extra_slots+1, SystemDictionary::serializable_klass()); 250 secondaries->obj_at_put(num_extra_slots+1, SystemDictionary::Serializable_klass());
251 for (int i = 0; i < num_elem_supers; i++) { 251 for (int i = 0; i < num_elem_supers; i++) {
252 klassOop elem_super = (klassOop) elem_supers->obj_at(i); 252 klassOop elem_super = (klassOop) elem_supers->obj_at(i);
253 klassOop array_super = elem_super->klass_part()->array_klass_or_null(); 253 klassOop array_super = elem_super->klass_part()->array_klass_or_null();
254 assert(array_super != NULL, "must already have been created"); 254 assert(array_super != NULL, "must already have been created");
255 secondaries->obj_at_put(num_extra_slots+2+i, array_super); 255 secondaries->obj_at_put(num_extra_slots+2+i, array_super);