Mercurial > hg > jdk9-shenandoah > langtools
changeset 2724:6641bd634136
8064803: Javac erroneously uses instantiated signatures when merging abstract most-specific methods
Summary: Wrong method type used in AmbiguousError.mergeAbstracts
Reviewed-by: jlahoda
author | mcimadamore |
---|---|
date | Mon, 17 Nov 2014 23:41:56 +0000 |
parents | 0b467b70ad82 |
children | c2339b4749af |
files | src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java test/tools/javac/generics/8064803/T8064803.java |
diffstat | 2 files changed, 54 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java Fri Nov 14 11:58:28 2014 +0100 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java Mon Nov 17 23:41:56 2014 +0000 @@ -4039,7 +4039,7 @@ s : new MethodSymbol( s.flags(), s.name, - types.createMethodTypeWithThrown(mt, allThrown), + types.createMethodTypeWithThrown(s.type, allThrown), s.owner); } }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/generics/8064803/T8064803.java Mon Nov 17 23:41:56 2014 +0000 @@ -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(); + } +}