diff -r 2e7898927798 -r 979ebd346ecf hotspot/src/share/vm/prims/methodHandles.cpp --- a/hotspot/src/share/vm/prims/methodHandles.cpp Tue Feb 14 20:00:28 2017 -0800 +++ b/hotspot/src/share/vm/prims/methodHandles.cpp Wed Feb 15 22:59:57 2017 -0500 @@ -833,8 +833,8 @@ } if (!have_name) { //not java_lang_String::create_from_symbol; let's intern member names - Handle name = StringTable::intern(m->name(), CHECK); - java_lang_invoke_MemberName::set_name(mname(), name()); + oop name = StringTable::intern(m->name(), CHECK); + java_lang_invoke_MemberName::set_name(mname(), name); } if (!have_type) { Handle type = java_lang_String::create_from_symbol(m->signature(), CHECK); @@ -857,14 +857,14 @@ } if (!have_name) { //not java_lang_String::create_from_symbol; let's intern member names - Handle name = StringTable::intern(fd.name(), CHECK); - java_lang_invoke_MemberName::set_name(mname(), name()); + oop name = StringTable::intern(fd.name(), CHECK); + java_lang_invoke_MemberName::set_name(mname(), name); } if (!have_type) { // If it is a primitive field type, don't mess with short strings like "I". - Handle type = field_signature_type_or_null(fd.signature()); + Handle type (THREAD, field_signature_type_or_null(fd.signature())); if (type.is_null()) { - java_lang_String::create_from_symbol(fd.signature(), CHECK); + type = java_lang_String::create_from_symbol(fd.signature(), CHECK); } java_lang_invoke_MemberName::set_type(mname(), type()); } @@ -1019,7 +1019,7 @@ assert_lock_strong(Compile_lock); int marked = 0; - CallSiteDepChange changes(call_site(), target()); + CallSiteDepChange changes(call_site, target); { NoSafepointVerifier nsv; MutexLockerEx mu2(CodeCache_lock, Mutex::_no_safepoint_check_flag); @@ -1283,7 +1283,7 @@ Handle mname(THREAD, JNIHandles::resolve_non_null(mname_jh)); intptr_t vmindex = java_lang_invoke_MemberName::vmindex(mname()); Metadata* vmtarget = java_lang_invoke_MemberName::vmtarget(mname()); - objArrayHandle result = oopFactory::new_objArray(SystemDictionary::Object_klass(), 2, CHECK_NULL); + objArrayHandle result = oopFactory::new_objArray_handle(SystemDictionary::Object_klass(), 2, CHECK_NULL); jvalue vmindex_value; vmindex_value.j = (long)vmindex; oop x = java_lang_boxing_object::create(T_LONG, &vmindex_value, CHECK_NULL); result->obj_at_put(0, x);