diff --git a/.hgtags b/.hgtags
index d0e71994ffa0afe62d51f8a191f9460cf4035ad8..7d05068729a00cc51ab4edbb119050d4d15b8143 100644
--- a/.hgtags
+++ b/.hgtags
@@ -693,5 +693,9 @@ f634736433d9fc1cffbdc55611f97ecb2cd44059 jdk8u121-b13
 f85da82b8218301a785ef925f8f3d8a59d6d3345 jdk8u131-b04
 5a4e3151102973a2e0420272b044d1db94337e74 jdk8u131-b05
 dd55d0995340fa86eb7e8bb41a7205dd724a4883 jdk8u131-b06
+bc4f253725f93d9b832ec60d521cd5426a9489ea jdk8u131-b07
+3a62189765a88f393a51923f98020ad7b2d4fc7d jdk8u131-b08
+2f2c4931d13c44bb6a0f808809e723de0677e302 jdk8u131-b09
+676a07884de49a7c60379da8ac892fe1403de6b6 jdk8u131-b10
 1175fac90fdbbd864f7b1f306397644d26eb9781 jdk8u141-b00
 4d69601f88c30e9f05e3b56c6d38a2f3eb47d477 jdk8u151-b00
diff --git a/src/share/classes/com/sun/tools/javac/code/Types.java b/src/share/classes/com/sun/tools/javac/code/Types.java
index d7110fbd1e103c7ca892b3fd22a88bd29d6ec205..b385f28497131d181c88e84bd4259ffaf39e5e3e 100644
--- a/src/share/classes/com/sun/tools/javac/code/Types.java
+++ b/src/share/classes/com/sun/tools/javac/code/Types.java
@@ -1067,7 +1067,7 @@ public class Types {
        List<Type> argtypes = msym.type.getParameterTypes();
        return (msym.flags_field & NATIVE) != 0 &&
                msym.owner == syms.methodHandleType.tsym &&
-               argtypes.tail.tail == null &&
+               argtypes.length() == 1 &&
                argtypes.head.hasTag(TypeTag.ARRAY) &&
                msym.type.getReturnType().tsym == syms.objectType.tsym &&
                ((ArrayType)argtypes.head).elemtype.tsym == syms.objectType.tsym;
diff --git a/test/tools/javac/meth/BadPolySig.java b/test/tools/javac/meth/BadPolySig.java
new file mode 100644
index 0000000000000000000000000000000000000000..4daf006a723b948417f7a2c0bbc680352ffc10f9
--- /dev/null
+++ b/test/tools/javac/meth/BadPolySig.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8168774
+ * @summary Polymorhic signature method check crashes javac
+ * @compile BadPolySig.java
+ */
+
+package java.lang.invoke;
+
+class MethodHandle {
+    native Object m();
+}