Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/javac/code/Types.java	Thu Feb 21 15:23:48 2013 +0000
     1.2 +++ b/src/share/classes/com/sun/tools/javac/code/Types.java	Thu Feb 21 15:25:03 2013 +0000
     1.3 @@ -580,7 +580,17 @@
     1.4              for (Type t : formalInterface.getTypeArguments()) {
     1.5                  if (actualTypeargs.head.hasTag(WILDCARD)) {
     1.6                      WildcardType wt = (WildcardType)actualTypeargs.head;
     1.7 -                    typeargs.append(wt.type);
     1.8 +                    Type bound;
     1.9 +                    switch (wt.kind) {
    1.10 +                        case UNBOUND:
    1.11 +                            //use declared bound if it doesn't depend on formal type-args
    1.12 +                            bound = wt.bound.bound.containsAny(formalInterface.getTypeArguments()) ?
    1.13 +                                    syms.objectType : wt.bound.bound;
    1.14 +                            break;
    1.15 +                        default:
    1.16 +                            bound = wt.type;
    1.17 +                    }
    1.18 +                    typeargs.append(bound);
    1.19                  } else {
    1.20                      typeargs.append(actualTypeargs.head);
    1.21                  }

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/tools/javac/lambda/TargetType64.java	Thu Feb 21 15:25:03 2013 +0000
     2.3 @@ -0,0 +1,41 @@
     2.4 +/*
     2.5 + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
     2.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.7 + *
     2.8 + * This code is free software; you can redistribute it and/or modify it
     2.9 + * under the terms of the GNU General Public License version 2 only, as
    2.10 + * published by the Free Software Foundation.
    2.11 + *
    2.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
    2.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    2.15 + * version 2 for more details (a copy is included in the LICENSE file that
    2.16 + * accompanied this code).
    2.17 + *
    2.18 + * You should have received a copy of the GNU General Public License version
    2.19 + * 2 along with this work; if not, write to the Free Software Foundation,
    2.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.21 + *
    2.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.23 + * or visit www.oracle.com if you need additional information or have any
    2.24 + * questions.
    2.25 + */
    2.26 +
    2.27 +/*
    2.28 + * @test
    2.29 + * @bug 8008293
    2.30 + * @summary Declared bounds not considered when functional interface containing unbound wildcards is instantiated
    2.31 + * @compile TargetType64.java
    2.32 + */
    2.33 +class TargetType64 {
    2.34 +    interface SAM<X extends Number> {
    2.35 +        void m(X x);
    2.36 +    }
    2.37 +
    2.38 +    void g(Object o) { }
    2.39 +
    2.40 +    void test() {
    2.41 +        SAM<?> s1 = (x)->{};
    2.42 +        SAM<?> s2 = this::g;
    2.43 +    }
    2.44 +}