Thu, 09 Mar 2017 10:13:31 -0800
Merge
.hgtags | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Thu Feb 16 13:16:54 2017 -0800 1.2 +++ b/.hgtags Thu Mar 09 10:13:31 2017 -0800 1.3 @@ -693,4 +693,8 @@ 1.4 f85da82b8218301a785ef925f8f3d8a59d6d3345 jdk8u131-b04 1.5 5a4e3151102973a2e0420272b044d1db94337e74 jdk8u131-b05 1.6 dd55d0995340fa86eb7e8bb41a7205dd724a4883 jdk8u131-b06 1.7 +bc4f253725f93d9b832ec60d521cd5426a9489ea jdk8u131-b07 1.8 +3a62189765a88f393a51923f98020ad7b2d4fc7d jdk8u131-b08 1.9 +2f2c4931d13c44bb6a0f808809e723de0677e302 jdk8u131-b09 1.10 +676a07884de49a7c60379da8ac892fe1403de6b6 jdk8u131-b10 1.11 1175fac90fdbbd864f7b1f306397644d26eb9781 jdk8u141-b00
2.1 --- a/src/share/classes/com/sun/tools/javac/code/Types.java Thu Feb 16 13:16:54 2017 -0800 2.2 +++ b/src/share/classes/com/sun/tools/javac/code/Types.java Thu Mar 09 10:13:31 2017 -0800 2.3 @@ -1067,7 +1067,7 @@ 2.4 List<Type> argtypes = msym.type.getParameterTypes(); 2.5 return (msym.flags_field & NATIVE) != 0 && 2.6 msym.owner == syms.methodHandleType.tsym && 2.7 - argtypes.tail.tail == null && 2.8 + argtypes.length() == 1 && 2.9 argtypes.head.hasTag(TypeTag.ARRAY) && 2.10 msym.type.getReturnType().tsym == syms.objectType.tsym && 2.11 ((ArrayType)argtypes.head).elemtype.tsym == syms.objectType.tsym;
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/test/tools/javac/meth/BadPolySig.java Thu Mar 09 10:13:31 2017 -0800 3.3 @@ -0,0 +1,37 @@ 3.4 +/* 3.5 + * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. 3.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3.7 + * 3.8 + * This code is free software; you can redistribute it and/or modify it 3.9 + * under the terms of the GNU General Public License version 2 only, as 3.10 + * published by the Free Software Foundation. Oracle designates this 3.11 + * particular file as subject to the "Classpath" exception as provided 3.12 + * by Oracle in the LICENSE file that accompanied this code. 3.13 + * 3.14 + * This code is distributed in the hope that it will be useful, but WITHOUT 3.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 3.16 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 3.17 + * version 2 for more details (a copy is included in the LICENSE file that 3.18 + * accompanied this code). 3.19 + * 3.20 + * You should have received a copy of the GNU General Public License version 3.21 + * 2 along with this work; if not, write to the Free Software Foundation, 3.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 3.23 + * 3.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 3.25 + * or visit www.oracle.com if you need additional information or have any 3.26 + * questions. 3.27 + */ 3.28 + 3.29 +/* 3.30 + * @test 3.31 + * @bug 8168774 3.32 + * @summary Polymorhic signature method check crashes javac 3.33 + * @compile BadPolySig.java 3.34 + */ 3.35 + 3.36 +package java.lang.invoke; 3.37 + 3.38 +class MethodHandle { 3.39 + native Object m(); 3.40 +}