Tue, 31 May 2016 10:20:43 -0700
Merge
aoqi@0 | 1 | /* |
aoqi@0 | 2 | * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
aoqi@0 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
aoqi@0 | 4 | * |
aoqi@0 | 5 | * This code is free software; you can redistribute it and/or modify it |
aoqi@0 | 6 | * under the terms of the GNU General Public License version 2 only, as |
aoqi@0 | 7 | * published by the Free Software Foundation. |
aoqi@0 | 8 | * |
aoqi@0 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
aoqi@0 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
aoqi@0 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
aoqi@0 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
aoqi@0 | 13 | * accompanied this code). |
aoqi@0 | 14 | * |
aoqi@0 | 15 | * You should have received a copy of the GNU General Public License version |
aoqi@0 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
aoqi@0 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
aoqi@0 | 18 | * |
aoqi@0 | 19 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
aoqi@0 | 20 | * or visit www.oracle.com if you need additional information or have any |
aoqi@0 | 21 | * questions. |
aoqi@0 | 22 | */ |
aoqi@0 | 23 | |
aoqi@0 | 24 | /* |
aoqi@0 | 25 | * @test |
aoqi@0 | 26 | * @bug 8029002 |
aoqi@0 | 27 | * @summary javac should take multiple upper bounds into account in incorporation |
aoqi@0 | 28 | * @compile MultipleUpperBoundsIncorporationTest.java |
aoqi@0 | 29 | */ |
aoqi@0 | 30 | |
aoqi@0 | 31 | import java.util.ArrayList; |
aoqi@0 | 32 | import java.util.List; |
aoqi@0 | 33 | |
aoqi@0 | 34 | public class MultipleUpperBoundsIncorporationTest { |
aoqi@0 | 35 | |
aoqi@0 | 36 | static class TestCase1 { |
aoqi@0 | 37 | interface Task<E extends Exception> {} |
aoqi@0 | 38 | |
aoqi@0 | 39 | class Comparator<T> {} |
aoqi@0 | 40 | |
aoqi@0 | 41 | class CustomException extends Exception {} |
aoqi@0 | 42 | |
aoqi@0 | 43 | class TaskQueue<E extends Exception, T extends Task<E>> {} |
aoqi@0 | 44 | |
aoqi@0 | 45 | abstract class Test { |
aoqi@0 | 46 | abstract <E extends Exception, T extends Task<E>> TaskQueue<E, T> create(Comparator<? super T> comparator); |
aoqi@0 | 47 | |
aoqi@0 | 48 | void f(Comparator<Task<CustomException>> comp) { |
aoqi@0 | 49 | TaskQueue<CustomException, Task<CustomException>> queue = create(comp); |
aoqi@0 | 50 | queue.getClass(); |
aoqi@0 | 51 | } |
aoqi@0 | 52 | } |
aoqi@0 | 53 | } |
aoqi@0 | 54 | |
aoqi@0 | 55 | static class TestCase2 { |
aoqi@0 | 56 | public <T, E extends List<T>> E typedNull() { |
aoqi@0 | 57 | return null; |
aoqi@0 | 58 | } |
aoqi@0 | 59 | |
aoqi@0 | 60 | public void call() { |
aoqi@0 | 61 | ArrayList<String> list = typedNull(); |
aoqi@0 | 62 | } |
aoqi@0 | 63 | } |
aoqi@0 | 64 | |
aoqi@0 | 65 | static class TestCase3 { |
aoqi@0 | 66 | interface I extends Iterable<String> {} |
aoqi@0 | 67 | |
aoqi@0 | 68 | <T, Exp extends Iterable<T>> Exp typedNull() { return null; } |
aoqi@0 | 69 | I i = typedNull(); |
aoqi@0 | 70 | } |
aoqi@0 | 71 | |
aoqi@0 | 72 | } |