--- a/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp	Fri May 26 13:47:33 2017 -0700
+++ b/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp	Sat May 27 09:21:01 2017 -0400
@@ -668,7 +668,7 @@
   oop base_object = JNIHandles::resolve(base);
   if (base_object == NULL) {
     method = *((Method**)(offset));
-  } else if (base_object->is_a(SystemDictionary::MemberName_klass())) {
+  } else if (base_object->is_a(SystemDictionary::ResolvedMethodName_klass())) {
     method = (Method*) (intptr_t) base_object->long_field(offset);
   } else if (base_object->is_a(SystemDictionary::HotSpotResolvedJavaMethodImpl_klass())) {
     method = *((Method**)(HotSpotResolvedJavaMethodImpl::metaspaceMethod(base_object) + offset));