Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Attr.java	Tue May 13 14:18:34 2014 +0100
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java	Tue May 13 16:11:43 2014 +0100
     1.3 @@ -518,6 +518,10 @@
     1.4              return new ResultInfo(pkind, pt, newContext);
     1.5          }
     1.6  
     1.7 +        protected ResultInfo dup(Type newPt, CheckContext newContext) {
     1.8 +            return new ResultInfo(pkind, newPt, newContext);
     1.9 +        }
    1.10 +
    1.11          @Override
    1.12          public String toString() {
    1.13              if (pt != null) {
    1.14 @@ -2840,7 +2844,8 @@
    1.15              ResultInfo checkInfo =
    1.16                      resultInfo.dup(newMethodTemplate(
    1.17                          desc.getReturnType().hasTag(VOID) ? Type.noType : desc.getReturnType(),
    1.18 -                        that.kind.isUnbound() ? argtypes.tail : argtypes, typeargtypes));
    1.19 +                        that.kind.isUnbound() ? argtypes.tail : argtypes, typeargtypes),
    1.20 +                        new FunctionalReturnContext(resultInfo.checkContext));
    1.21  
    1.22              Type refType = checkId(that, lookupHelper.site, refSym, localEnv, checkInfo);
    1.23  

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/tools/javac/generics/inference/T8028503/PrimitiveTypeInBoundForMethodRefTest.java	Tue May 13 16:11:43 2014 +0100
     2.3 @@ -0,0 +1,48 @@
     2.4 +/*
     2.5 + * Copyright (c) 2014, 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 8028503
    2.30 + * @summary javac, for method references a primitive type can be added as a bound
    2.31 + * @compile PrimitiveTypeInBoundForMethodRefTest.java
    2.32 + */
    2.33 +
    2.34 +class PrimitiveTypeInBoundForMethodRefTest {
    2.35 +
    2.36 +    interface Mapper<T, U> {
    2.37 +        U map(T t);
    2.38 +    }
    2.39 +
    2.40 +    static <U> Iterable<U> map(Mapper<String, U> mapper) {
    2.41 +        return null;
    2.42 +    }
    2.43 +
    2.44 +    static void test() {
    2.45 +        Iterable<Integer> map = map(PrimitiveTypeInBoundForMethodRefTest::length);
    2.46 +    }
    2.47 +
    2.48 +    public static <T> int length(String s) {
    2.49 +        return 0;
    2.50 +    }
    2.51 +}

     3.1 --- a/test/tools/javac/lambda/MethodReference42.out	Tue May 13 14:18:34 2014 +0100
     3.2 +++ b/test/tools/javac/lambda/MethodReference42.out	Tue May 13 16:11:43 2014 +0100
     3.3 @@ -1,4 +1,4 @@
     3.4 -MethodReference42.java:38:11: compiler.err.cant.apply.symbol: kindname.method, m1, MethodReference42.SAM1, @811, kindname.class, MethodReference42, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.incompatible.eq.upper.bounds: X, java.lang.String, java.lang.Number))
     3.5 -MethodReference42.java:40:11: compiler.err.cant.apply.symbol: kindname.method, m3, MethodReference42.SAM3, @855, kindname.class, MethodReference42, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.incompatible.eq.upper.bounds: X, java.lang.Object, java.lang.Number))
     3.6 +MethodReference42.java:38:11: compiler.err.cant.apply.symbol: kindname.method, m1, MethodReference42.SAM1, @811, kindname.class, MethodReference42, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.incompatible.ret.type.in.lambda: (compiler.misc.incompatible.eq.upper.bounds: X, java.lang.String, java.lang.Number)))
     3.7 +MethodReference42.java:40:11: compiler.err.cant.apply.symbol: kindname.method, m3, MethodReference42.SAM3, @855, kindname.class, MethodReference42, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.incompatible.ret.type.in.lambda: (compiler.misc.incompatible.eq.upper.bounds: X, java.lang.Object, java.lang.Number)))
     3.8  MethodReference42.java:41:9: compiler.err.ref.ambiguous: m4, kindname.method, m4(MethodReference42.SAM2), MethodReference42, kindname.method, m4(MethodReference42.SAM3), MethodReference42
     3.9  3 errors

     4.1 --- a/test/tools/javac/lambda/MethodReference44.out	Tue May 13 14:18:34 2014 +0100
     4.2 +++ b/test/tools/javac/lambda/MethodReference44.out	Tue May 13 16:11:43 2014 +0100
     4.3 @@ -1,4 +1,4 @@
     4.4 -MethodReference44.java:40:11: compiler.err.cant.apply.symbol: kindname.method, g1, MethodReference44.SAM1, @864, kindname.class, MethodReference44, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.incompatible.eq.upper.bounds: X, java.lang.String, java.lang.Number))
     4.5 -MethodReference44.java:42:11: compiler.err.cant.apply.symbol: kindname.method, g3, MethodReference44.SAM3, @932, kindname.class, MethodReference44, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.incompatible.eq.upper.bounds: X, java.lang.Object, java.lang.Number))
     4.6 +MethodReference44.java:40:11: compiler.err.cant.apply.symbol: kindname.method, g1, MethodReference44.SAM1, @864, kindname.class, MethodReference44, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.incompatible.ret.type.in.lambda: (compiler.misc.incompatible.eq.upper.bounds: X, java.lang.String, java.lang.Number)))
     4.7 +MethodReference44.java:42:11: compiler.err.cant.apply.symbol: kindname.method, g3, MethodReference44.SAM3, @932, kindname.class, MethodReference44, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.incompatible.ret.type.in.lambda: (compiler.misc.incompatible.eq.upper.bounds: X, java.lang.Object, java.lang.Number)))
     4.8  MethodReference44.java:43:9: compiler.err.ref.ambiguous: g4, kindname.method, g4(MethodReference44.SAM2), MethodReference44, kindname.method, g4(MethodReference44.SAM3), MethodReference44
     4.9  3 errors