--- a/src/share/vm/jvmci/jvmciCompilerToVM.cpp	Wed Feb 08 23:25:01 2017 +0100
+++ b/src/share/vm/jvmci/jvmciCompilerToVM.cpp	Wed Feb 08 23:49:32 2017 +0100
@@ -938,6 +938,11 @@
   Symbol* h_name      = method->name();
   Symbol* h_signature = method->signature();
 
+  vmIntrinsics::ID iid = method()->intrinsic_id();
+  if (MethodHandles::is_signature_polymorphic(iid) && MethodHandles::is_signature_polymorphic_intrinsic(iid)) {
+      // Signature polymorphic methods are already resolved, JVMCI just returns NULL in this case.
+      return NULL;
+  }
   methodHandle m;
   // Only do exact lookup if receiver klass has been linked.  Otherwise,
   // the vtable has not been setup, and the LinkResolver will fail.