changeset 3358:6d62608794f2

Merge
author asaha
date Fri, 24 Feb 2017 09:20:54 -0800
parents 538b7b67a3b9 2f2c4931d13c
children 4d0a292c1ab2
files .hgtags
diffstat 3 files changed, 40 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Feb 07 11:24:34 2017 -0800
+++ b/.hgtags	Fri Feb 24 09:20:54 2017 -0800
@@ -689,4 +689,6 @@
 f85da82b8218301a785ef925f8f3d8a59d6d3345 jdk8u131-b04
 5a4e3151102973a2e0420272b044d1db94337e74 jdk8u131-b05
 dd55d0995340fa86eb7e8bb41a7205dd724a4883 jdk8u131-b06
+bc4f253725f93d9b832ec60d521cd5426a9489ea jdk8u131-b07
+3a62189765a88f393a51923f98020ad7b2d4fc7d jdk8u131-b08
 1175fac90fdbbd864f7b1f306397644d26eb9781 jdk8u141-b00
--- a/src/share/classes/com/sun/tools/javac/code/Types.java	Tue Feb 07 11:24:34 2017 -0800
+++ b/src/share/classes/com/sun/tools/javac/code/Types.java	Fri Feb 24 09:20:54 2017 -0800
@@ -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	Fri Feb 24 09:20:54 2017 -0800
@@ -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();
+}