--- a/.hgtags	Tue May 09 03:09:53 2017 +0100
+++ b/.hgtags	Tue May 09 04:03:36 2017 +0100
@@ -709,3 +709,15 @@
 26a274d91ee67eb2f029da07676bacc8af09f93b icedtea-3.3.0pre02
 d10a13bdc98ca6a44ef27059c8403162a7059197 icedtea-3.3.0
 a3d47fe59cc4a4d7956d68c93862c2ce1e1062f0 icedtea-3.4.0pre01
+f634736433d9fc1cffbdc55611f97ecb2cd44059 jdk8u121-b13
+8b331e7199f74a2dea8a8a866f0d7f1977f146ee jdk8u131-b00
+0d04068f82fe680c65619e08ef012ead7483873b jdk8u131-b01
+452448c6347af8f7bd827dd4632ac06c991a15b8 jdk8u131-b02
+38ea0481f6438a6379941d5c6cfc3078ab384027 jdk8u131-b03
+f85da82b8218301a785ef925f8f3d8a59d6d3345 jdk8u131-b04
+5a4e3151102973a2e0420272b044d1db94337e74 jdk8u131-b05
+dd55d0995340fa86eb7e8bb41a7205dd724a4883 jdk8u131-b06
+bc4f253725f93d9b832ec60d521cd5426a9489ea jdk8u131-b07
+3a62189765a88f393a51923f98020ad7b2d4fc7d jdk8u131-b08
+2f2c4931d13c44bb6a0f808809e723de0677e302 jdk8u131-b09
+676a07884de49a7c60379da8ac892fe1403de6b6 jdk8u131-b10

--- a/src/share/classes/com/sun/tools/javac/code/Types.java	Tue May 09 03:09:53 2017 +0100
+++ b/src/share/classes/com/sun/tools/javac/code/Types.java	Tue May 09 04:03:36 2017 +0100
@@ -1067,7 +1067,7 @@
        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;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/meth/BadPolySig.java	Tue May 09 04:03:36 2017 +0100
@@ -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();
+}