Mercurial > hg > openjdk > aarch64-port > langtools
changeset 2817:ecb7e46b820f jdk8u60-b16
Merge
author | lana |
---|---|
date | Thu, 14 May 2015 20:12:16 -0700 |
parents | 8be5d555ac85 (current diff) 0a2f84dc30f2 (diff) |
children | 87dcdc1fd75b f6923d26b0fb |
files | |
diffstat | 3 files changed, 56 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java Wed May 13 12:50:11 2015 -0700 +++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java Thu May 14 20:12:16 2015 -0700 @@ -4086,7 +4086,7 @@ s : new MethodSymbol( s.flags(), s.name, - types.createMethodTypeWithThrown(mt, allThrown), + types.createMethodTypeWithThrown(s.type, allThrown), s.owner); } }
--- a/src/share/classes/com/sun/tools/javac/resources/javac.properties Wed May 13 12:50:11 2015 -0700 +++ b/src/share/classes/com/sun/tools/javac/resources/javac.properties Thu May 14 20:12:16 2015 -0700 @@ -232,8 +232,8 @@ javac.msg.bug=\ An exception has occurred in the compiler ({0}). \ -Please file a bug at the Java Developer Connection (http://java.sun.com/webapps/bugreport) \ -after checking the Bug Parade for duplicates. \ +Please file a bug at the Java Bug Database (http://bugreport.java.com/bugreport/) \ +after checking the database for duplicates. \ Include your program and the following diagnostic in your report. Thank you. javac.msg.io=\
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/generics/8064803/T8064803.java Thu May 14 20:12:16 2015 -0700 @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2014, 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 8064803 + * @summary Javac erroneously uses instantiated signatures when merging abstract most-specific methods + */ +public class T8064803 { + interface ParentA<T> { + T process() throws Exception; + } + + interface ParentB<T> { + T process() throws Exception; + } + + interface Child<T> extends ParentA<T>, ParentB<T> { } + + static class ChildImpl<T> implements Child<T> { + @Override + public T process() { + return null; + } + } + + public static void main(String[] args) throws Exception { + Child<String> child = new ChildImpl<String>(); + child.process(); + } +}