Thu, 21 Feb 2013 15:26:46 +0000
8007461: Regression: bad overload resolution when inner class and outer class have method with same name
Summary: Fix regression in varargs method resolution introduced by bad refactoring
Reviewed-by: jjg
duke@1 | 1 | /* |
ohair@554 | 2 | * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved. |
duke@1 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
duke@1 | 4 | * |
duke@1 | 5 | * This code is free software; you can redistribute it and/or modify it |
duke@1 | 6 | * under the terms of the GNU General Public License version 2 only, as |
duke@1 | 7 | * published by the Free Software Foundation. |
duke@1 | 8 | * |
duke@1 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
duke@1 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
duke@1 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
duke@1 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
duke@1 | 13 | * accompanied this code). |
duke@1 | 14 | * |
duke@1 | 15 | * You should have received a copy of the GNU General Public License version |
duke@1 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
duke@1 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
duke@1 | 18 | * |
ohair@554 | 19 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
ohair@554 | 20 | * or visit www.oracle.com if you need additional information or have any |
ohair@554 | 21 | * questions. |
duke@1 | 22 | */ |
duke@1 | 23 | |
duke@1 | 24 | /** |
duke@1 | 25 | * @test |
duke@1 | 26 | * @bug 6365166 |
duke@1 | 27 | * @summary javac (generic) unable to resolve methods |
duke@1 | 28 | * @compile NewTest.java |
duke@1 | 29 | */ |
duke@1 | 30 | |
duke@1 | 31 | import java.util.*; |
duke@1 | 32 | |
duke@1 | 33 | public class NewTest<A,B> { |
duke@1 | 34 | private List<A> toAdd; |
duke@1 | 35 | |
duke@1 | 36 | public NewTest(List<A> toAdd) { |
duke@1 | 37 | this.toAdd = toAdd; |
duke@1 | 38 | } |
duke@1 | 39 | |
duke@1 | 40 | private List<A> getRelated(B b) { |
duke@1 | 41 | //some application logic |
duke@1 | 42 | //for demo |
duke@1 | 43 | return toAdd; |
duke@1 | 44 | } |
duke@1 | 45 | |
duke@1 | 46 | @SuppressWarnings("unchecked") |
duke@1 | 47 | public <L extends List<? super A>,LF extends Factory<L>> L addOrCreate4(B b,L l,LF lf) { |
duke@1 | 48 | if (l == null) { |
duke@1 | 49 | l = lf.create(); |
duke@1 | 50 | } |
duke@1 | 51 | ((List<? super A>)l).addAll(getRelated(b)); //to get round the compiler bug |
duke@1 | 52 | return l; |
duke@1 | 53 | } |
duke@1 | 54 | |
duke@1 | 55 | public static class ListFactory<T> implements Factory<List<T>>{ |
duke@1 | 56 | public List<T> create() { |
duke@1 | 57 | return new ArrayList<T>(); |
duke@1 | 58 | } |
duke@1 | 59 | } |
duke@1 | 60 | public static interface Factory<T> { |
duke@1 | 61 | public T create(); |
duke@1 | 62 | } |
duke@1 | 63 | |
duke@1 | 64 | public static void main(String ... args) { |
duke@1 | 65 | ListFactory<Number> lf = new ListFactory<Number>(); |
duke@1 | 66 | List<Long> longs = new ArrayList<Long>(); |
duke@1 | 67 | longs.add(new Long(1)); |
duke@1 | 68 | NewTest<Long,Number> test = new NewTest<Long,Number>(longs); |
duke@1 | 69 | |
duke@1 | 70 | List<Number> ret4 = null; |
duke@1 | 71 | |
duke@1 | 72 | ret4 = test.addOrCreate4(1, ret4,lf); |
duke@1 | 73 | |
duke@1 | 74 | } |
duke@1 | 75 | } |