aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormcimadamore <none@none>2017-01-05 18:58:06 +0000
committermcimadamore <none@none>2017-01-05 18:58:06 +0000
commitccd92e7c8d89105c807a357f85ae4a8a416ab3a6 (patch)
tree499bc337b11bd359aa561617919c386b490742e6
parent8f4efb4ce9c0e34dd1b6bbbbafe3326efabe5ab9 (diff)
downloadjdk8u_langtools-ccd92e7c8d89105c807a357f85ae4a8a416ab3a6.tar.gz
Summary: Check for polysig method assumes arity is greater than zero Reviewed-by: vromero
-rw-r--r--src/share/classes/com/sun/tools/javac/code/Types.java2
-rw-r--r--test/tools/javac/meth/BadPolySig.java37
2 files changed, 38 insertions, 1 deletions
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 d7110fbd..b385f284 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 00000000..4daf006a
--- /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();
+}