--- a/hotspot/src/share/vm/prims/methodHandles.hpp	Thu Mar 24 09:09:52 2016 +0100
+++ b/hotspot/src/share/vm/prims/methodHandles.hpp	Thu Mar 24 11:21:49 2016 +0100
@@ -120,7 +120,8 @@
             iid <= vmIntrinsics::_linkToInterface);
   }
   static bool has_member_arg(Symbol* klass, Symbol* name) {
-    if ((klass == vmSymbols::java_lang_invoke_MethodHandle()) &&
+    if ((klass == vmSymbols::java_lang_invoke_MethodHandle() ||
+         klass == vmSymbols::java_lang_invoke_VarHandle()) &&
         is_signature_polymorphic_name(name)) {
       vmIntrinsics::ID iid = signature_polymorphic_name_id(name);
       return has_member_arg(iid);