8161445: [BACKOUT] MemberNameTable doesn't purge stale entries

Original change caused performance regression in microbenchmarks after GC

Reviewed-by: dholmes, ecaspole
This commit is contained in:
Coleen Phillimore 2016-08-01 16:28:23 -04:00
parent f4338a53f4
commit 8f37b6e451
7 changed files with 18 additions and 54 deletions

View file

@ -2737,7 +2737,7 @@ nmethod* InstanceKlass::lookup_osr_nmethod(const Method* m, int bci, int comp_le
return NULL;
}
oop InstanceKlass::add_member_name(Handle mem_name, bool intern) {
bool InstanceKlass::add_member_name(Handle mem_name) {
jweak mem_name_wref = JNIHandles::make_weak_global(mem_name);
MutexLocker ml(MemberNameTable_lock);
DEBUG_ONLY(NoSafepointVerifier nsv);
@ -2747,7 +2747,7 @@ oop InstanceKlass::add_member_name(Handle mem_name, bool intern) {
// is called!
Method* method = (Method*)java_lang_invoke_MemberName::vmtarget(mem_name());
if (method->is_obsolete()) {
return NULL;
return false;
} else if (method->is_old()) {
// Replace method with redefined version
java_lang_invoke_MemberName::set_vmtarget(mem_name(), method_with_idnum(method->method_idnum()));
@ -2756,11 +2756,8 @@ oop InstanceKlass::add_member_name(Handle mem_name, bool intern) {
if (_member_names == NULL) {
_member_names = new (ResourceObj::C_HEAP, mtClass) MemberNameTable(idnum_allocated_count());
}
if (intern) {
return _member_names->find_or_add_member_name(mem_name_wref);
} else {
return _member_names->add_member_name(mem_name_wref);
}
_member_names->add_member_name(mem_name_wref);
return true;
}
// -----------------------------------------------------------------------------------------------------