提交 a6d540e5 编写于 作者: J jcoomes

6786195: many nsk.monitoring tests fail with -server -Xcomp

Summary: remove Universe::_fillerArrayKlassObj and associated code
Reviewed-by: jmasa, tonyp
上级 1a26624c
...@@ -178,8 +178,7 @@ CollectedHeap::fill_with_array(HeapWord* start, size_t words) ...@@ -178,8 +178,7 @@ CollectedHeap::fill_with_array(HeapWord* start, size_t words)
// Set the length first for concurrent GC. // Set the length first for concurrent GC.
((arrayOop)start)->set_length((int)len); ((arrayOop)start)->set_length((int)len);
post_allocation_setup_common(Universe::fillerArrayKlassObj(), start, post_allocation_setup_common(Universe::intArrayKlassObj(), start, words);
words);
DEBUG_ONLY(zap_filler_array(start, words);) DEBUG_ONLY(zap_filler_array(start, words);)
} }
......
...@@ -49,7 +49,6 @@ klassOop Universe::_constantPoolKlassObj = NULL; ...@@ -49,7 +49,6 @@ klassOop Universe::_constantPoolKlassObj = NULL;
klassOop Universe::_constantPoolCacheKlassObj = NULL; klassOop Universe::_constantPoolCacheKlassObj = NULL;
klassOop Universe::_compiledICHolderKlassObj = NULL; klassOop Universe::_compiledICHolderKlassObj = NULL;
klassOop Universe::_systemObjArrayKlassObj = NULL; klassOop Universe::_systemObjArrayKlassObj = NULL;
klassOop Universe::_fillerArrayKlassObj = NULL;
oop Universe::_int_mirror = NULL; oop Universe::_int_mirror = NULL;
oop Universe::_float_mirror = NULL; oop Universe::_float_mirror = NULL;
oop Universe::_double_mirror = NULL; oop Universe::_double_mirror = NULL;
...@@ -127,7 +126,6 @@ void Universe::system_classes_do(void f(klassOop)) { ...@@ -127,7 +126,6 @@ void Universe::system_classes_do(void f(klassOop)) {
f(instanceKlassKlassObj()); f(instanceKlassKlassObj());
f(constantPoolKlassObj()); f(constantPoolKlassObj());
f(systemObjArrayKlassObj()); f(systemObjArrayKlassObj());
f(fillerArrayKlassObj());
} }
void Universe::oops_do(OopClosure* f, bool do_all) { void Universe::oops_do(OopClosure* f, bool do_all) {
...@@ -182,7 +180,6 @@ void Universe::oops_do(OopClosure* f, bool do_all) { ...@@ -182,7 +180,6 @@ void Universe::oops_do(OopClosure* f, bool do_all) {
f->do_oop((oop*)&_constantPoolCacheKlassObj); f->do_oop((oop*)&_constantPoolCacheKlassObj);
f->do_oop((oop*)&_compiledICHolderKlassObj); f->do_oop((oop*)&_compiledICHolderKlassObj);
f->do_oop((oop*)&_systemObjArrayKlassObj); f->do_oop((oop*)&_systemObjArrayKlassObj);
f->do_oop((oop*)&_fillerArrayKlassObj);
f->do_oop((oop*)&_the_empty_byte_array); f->do_oop((oop*)&_the_empty_byte_array);
f->do_oop((oop*)&_the_empty_short_array); f->do_oop((oop*)&_the_empty_short_array);
f->do_oop((oop*)&_the_empty_int_array); f->do_oop((oop*)&_the_empty_int_array);
...@@ -268,7 +265,6 @@ void Universe::genesis(TRAPS) { ...@@ -268,7 +265,6 @@ void Universe::genesis(TRAPS) {
_compiledICHolderKlassObj = compiledICHolderKlass::create_klass(CHECK); _compiledICHolderKlassObj = compiledICHolderKlass::create_klass(CHECK);
_systemObjArrayKlassObj = objArrayKlassKlass::cast(objArrayKlassKlassObj())->allocate_system_objArray_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_byte_array = oopFactory::new_permanent_byteArray(0, CHECK);
_the_empty_short_array = oopFactory::new_permanent_shortArray(0, CHECK); _the_empty_short_array = oopFactory::new_permanent_shortArray(0, CHECK);
......
...@@ -133,7 +133,6 @@ class Universe: AllStatic { ...@@ -133,7 +133,6 @@ class Universe: AllStatic {
static klassOop _constantPoolCacheKlassObj; static klassOop _constantPoolCacheKlassObj;
static klassOop _compiledICHolderKlassObj; static klassOop _compiledICHolderKlassObj;
static klassOop _systemObjArrayKlassObj; static klassOop _systemObjArrayKlassObj;
static klassOop _fillerArrayKlassObj;
// Known objects in the VM // Known objects in the VM
...@@ -266,7 +265,6 @@ class Universe: AllStatic { ...@@ -266,7 +265,6 @@ class Universe: AllStatic {
static klassOop constantPoolCacheKlassObj() { return _constantPoolCacheKlassObj; } static klassOop constantPoolCacheKlassObj() { return _constantPoolCacheKlassObj; }
static klassOop compiledICHolderKlassObj() { return _compiledICHolderKlassObj; } static klassOop compiledICHolderKlassObj() { return _compiledICHolderKlassObj; }
static klassOop systemObjArrayKlassObj() { return _systemObjArrayKlassObj; } static klassOop systemObjArrayKlassObj() { return _systemObjArrayKlassObj; }
static klassOop fillerArrayKlassObj() { return _fillerArrayKlassObj; }
// Known objects in tbe VM // Known objects in tbe VM
static oop int_mirror() { return check_mirror(_int_mirror); static oop int_mirror() { return check_mirror(_int_mirror);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册