--- a/hotspot/src/share/vm/oops/instanceKlass.cpp Mon Aug 01 15:38:58 2016 +0300
+++ b/hotspot/src/share/vm/oops/instanceKlass.cpp Mon Aug 01 16:28:23 2016 -0400
@@ -2737,7 +2737,7 @@
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 @@
// 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 @@
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;
}
// -----------------------------------------------------------------------------------------------------