comparison src/share/vm/memory/universe.cpp @ 494:d593294016c3

6786195: many nsk.monitoring tests fail with -server -Xcomp Summary: remove Universe::_fillerArrayKlassObj and associated code Reviewed-by: jmasa, tonyp
author jcoomes
date Thu, 18 Dec 2008 01:27:04 -0800
parents 7d7a7c599c17
children 0fbdb4381b99 660978a2a31a
comparison
equal deleted inserted replaced
483:0f773163217d 494:d593294016c3
47 klassOop Universe::_instanceKlassKlassObj = NULL; 47 klassOop Universe::_instanceKlassKlassObj = NULL;
48 klassOop Universe::_constantPoolKlassObj = NULL; 48 klassOop Universe::_constantPoolKlassObj = NULL;
49 klassOop Universe::_constantPoolCacheKlassObj = NULL; 49 klassOop Universe::_constantPoolCacheKlassObj = NULL;
50 klassOop Universe::_compiledICHolderKlassObj = NULL; 50 klassOop Universe::_compiledICHolderKlassObj = NULL;
51 klassOop Universe::_systemObjArrayKlassObj = NULL; 51 klassOop Universe::_systemObjArrayKlassObj = NULL;
52 klassOop Universe::_fillerArrayKlassObj = NULL;
53 oop Universe::_int_mirror = NULL; 52 oop Universe::_int_mirror = NULL;
54 oop Universe::_float_mirror = NULL; 53 oop Universe::_float_mirror = NULL;
55 oop Universe::_double_mirror = NULL; 54 oop Universe::_double_mirror = NULL;
56 oop Universe::_byte_mirror = NULL; 55 oop Universe::_byte_mirror = NULL;
57 oop Universe::_bool_mirror = NULL; 56 oop Universe::_bool_mirror = NULL;
125 f(objArrayKlassKlassObj()); 124 f(objArrayKlassKlassObj());
126 f(typeArrayKlassKlassObj()); 125 f(typeArrayKlassKlassObj());
127 f(instanceKlassKlassObj()); 126 f(instanceKlassKlassObj());
128 f(constantPoolKlassObj()); 127 f(constantPoolKlassObj());
129 f(systemObjArrayKlassObj()); 128 f(systemObjArrayKlassObj());
130 f(fillerArrayKlassObj());
131 } 129 }
132 130
133 void Universe::oops_do(OopClosure* f, bool do_all) { 131 void Universe::oops_do(OopClosure* f, bool do_all) {
134 132
135 f->do_oop((oop*) &_int_mirror); 133 f->do_oop((oop*) &_int_mirror);
180 f->do_oop((oop*)&_instanceKlassKlassObj); 178 f->do_oop((oop*)&_instanceKlassKlassObj);
181 f->do_oop((oop*)&_constantPoolKlassObj); 179 f->do_oop((oop*)&_constantPoolKlassObj);
182 f->do_oop((oop*)&_constantPoolCacheKlassObj); 180 f->do_oop((oop*)&_constantPoolCacheKlassObj);
183 f->do_oop((oop*)&_compiledICHolderKlassObj); 181 f->do_oop((oop*)&_compiledICHolderKlassObj);
184 f->do_oop((oop*)&_systemObjArrayKlassObj); 182 f->do_oop((oop*)&_systemObjArrayKlassObj);
185 f->do_oop((oop*)&_fillerArrayKlassObj);
186 f->do_oop((oop*)&_the_empty_byte_array); 183 f->do_oop((oop*)&_the_empty_byte_array);
187 f->do_oop((oop*)&_the_empty_short_array); 184 f->do_oop((oop*)&_the_empty_short_array);
188 f->do_oop((oop*)&_the_empty_int_array); 185 f->do_oop((oop*)&_the_empty_int_array);
189 f->do_oop((oop*)&_the_empty_system_obj_array); 186 f->do_oop((oop*)&_the_empty_system_obj_array);
190 f->do_oop((oop*)&_the_empty_class_klass_array); 187 f->do_oop((oop*)&_the_empty_class_klass_array);
266 _constantPoolKlassObj = constantPoolKlass::create_klass(CHECK); 263 _constantPoolKlassObj = constantPoolKlass::create_klass(CHECK);
267 _constantPoolCacheKlassObj = constantPoolCacheKlass::create_klass(CHECK); 264 _constantPoolCacheKlassObj = constantPoolCacheKlass::create_klass(CHECK);
268 265
269 _compiledICHolderKlassObj = compiledICHolderKlass::create_klass(CHECK); 266 _compiledICHolderKlassObj = compiledICHolderKlass::create_klass(CHECK);
270 _systemObjArrayKlassObj = objArrayKlassKlass::cast(objArrayKlassKlassObj())->allocate_system_objArray_klass(CHECK); 267 _systemObjArrayKlassObj = objArrayKlassKlass::cast(objArrayKlassKlassObj())->allocate_system_objArray_klass(CHECK);
271 _fillerArrayKlassObj = typeArrayKlass::create_klass(T_INT, sizeof(jint), "<filler>", CHECK);
272 268
273 _the_empty_byte_array = oopFactory::new_permanent_byteArray(0, CHECK); 269 _the_empty_byte_array = oopFactory::new_permanent_byteArray(0, CHECK);
274 _the_empty_short_array = oopFactory::new_permanent_shortArray(0, CHECK); 270 _the_empty_short_array = oopFactory::new_permanent_shortArray(0, CHECK);
275 _the_empty_int_array = oopFactory::new_permanent_intArray(0, CHECK); 271 _the_empty_int_array = oopFactory::new_permanent_intArray(0, CHECK);
276 _the_empty_system_obj_array = oopFactory::new_system_objArray(0, CHECK); 272 _the_empty_system_obj_array = oopFactory::new_system_objArray(0, CHECK);