6786195: many nsk.monitoring tests fail with -server -Xcomp
Summary: remove Universe::_fillerArrayKlassObj and associated code
Reviewed-by: jmasa, tonyp
--- a/hotspot/src/share/vm/gc_interface/collectedHeap.cpp Thu Dec 11 12:05:21 2008 -0800
+++ b/hotspot/src/share/vm/gc_interface/collectedHeap.cpp Thu Dec 18 01:27:04 2008 -0800
@@ -178,8 +178,7 @@
// Set the length first for concurrent GC.
((arrayOop)start)->set_length((int)len);
- post_allocation_setup_common(Universe::fillerArrayKlassObj(), start,
- words);
+ post_allocation_setup_common(Universe::intArrayKlassObj(), start, words);
DEBUG_ONLY(zap_filler_array(start, words);)
}
--- a/hotspot/src/share/vm/memory/universe.cpp Thu Dec 11 12:05:21 2008 -0800
+++ b/hotspot/src/share/vm/memory/universe.cpp Thu Dec 18 01:27:04 2008 -0800
@@ -49,7 +49,6 @@
klassOop Universe::_constantPoolCacheKlassObj = NULL;
klassOop Universe::_compiledICHolderKlassObj = NULL;
klassOop Universe::_systemObjArrayKlassObj = NULL;
-klassOop Universe::_fillerArrayKlassObj = NULL;
oop Universe::_int_mirror = NULL;
oop Universe::_float_mirror = NULL;
oop Universe::_double_mirror = NULL;
@@ -127,7 +126,6 @@
f(instanceKlassKlassObj());
f(constantPoolKlassObj());
f(systemObjArrayKlassObj());
- f(fillerArrayKlassObj());
}
void Universe::oops_do(OopClosure* f, bool do_all) {
@@ -182,7 +180,6 @@
f->do_oop((oop*)&_constantPoolCacheKlassObj);
f->do_oop((oop*)&_compiledICHolderKlassObj);
f->do_oop((oop*)&_systemObjArrayKlassObj);
- f->do_oop((oop*)&_fillerArrayKlassObj);
f->do_oop((oop*)&_the_empty_byte_array);
f->do_oop((oop*)&_the_empty_short_array);
f->do_oop((oop*)&_the_empty_int_array);
@@ -268,7 +265,6 @@
_compiledICHolderKlassObj = compiledICHolderKlass::create_klass(CHECK);
_systemObjArrayKlassObj = objArrayKlassKlass::cast(objArrayKlassKlassObj())->allocate_system_objArray_klass(CHECK);
- _fillerArrayKlassObj = typeArrayKlass::create_klass(T_INT, sizeof(jint), "<filler>", CHECK);
_the_empty_byte_array = oopFactory::new_permanent_byteArray(0, CHECK);
_the_empty_short_array = oopFactory::new_permanent_shortArray(0, CHECK);
--- a/hotspot/src/share/vm/memory/universe.hpp Thu Dec 11 12:05:21 2008 -0800
+++ b/hotspot/src/share/vm/memory/universe.hpp Thu Dec 18 01:27:04 2008 -0800
@@ -133,7 +133,6 @@
static klassOop _constantPoolCacheKlassObj;
static klassOop _compiledICHolderKlassObj;
static klassOop _systemObjArrayKlassObj;
- static klassOop _fillerArrayKlassObj;
// Known objects in the VM
@@ -266,7 +265,6 @@
static klassOop constantPoolCacheKlassObj() { return _constantPoolCacheKlassObj; }
static klassOop compiledICHolderKlassObj() { return _compiledICHolderKlassObj; }
static klassOop systemObjArrayKlassObj() { return _systemObjArrayKlassObj; }
- static klassOop fillerArrayKlassObj() { return _fillerArrayKlassObj; }
// Known objects in tbe VM
static oop int_mirror() { return check_mirror(_int_mirror);