Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java	Thu Oct 09 12:15:29 2014 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java	Mon Oct 13 20:06:55 2014 -0700
     1.3 @@ -846,6 +846,10 @@
     1.4                  if (rcvr == null) return null;
     1.5                  JCExpression rcvrExpr = make.Ident(rcvr);
     1.6                  Type rcvrType = tree.sym.enclClass().type;
     1.7 +                if (rcvrType == syms.arrayClass.type) {
     1.8 +                    // Map the receiver type to the actually type, not just "array"
     1.9 +                    rcvrType = tree.getQualifierExpression().type;
    1.10 +                }
    1.11                  if (!rcvr.type.tsym.isSubClass(rcvrType.tsym, types)) {
    1.12                      rcvrExpr = make.TypeCast(make.Type(rcvrType), rcvrExpr).setType(rcvrType);
    1.13                  }

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/tools/javac/lambda/MethodReferenceArrayClone.java	Mon Oct 13 20:06:55 2014 -0700
     2.3 @@ -0,0 +1,67 @@
     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 8056051
    2.30 + * @summary int[]::clone causes "java.lang.NoClassDefFoundError: Array"
    2.31 + * @run main MethodReferenceArrayClone
    2.32 + */
    2.33 +
    2.34 +import java.util.Arrays;
    2.35 +import java.util.function.Function;
    2.36 +import java.util.function.Supplier;
    2.37 +
    2.38 +public class MethodReferenceArrayClone {
    2.39 +    public static void main(String[] args) {
    2.40 +        int[] intArgs = new int[] {1, 2, 3, 4, 5};
    2.41 +        checkInt("int[]::clone", int[]::clone, intArgs);
    2.42 +        checkInt("a -> a.clone()", a -> a.clone(), intArgs);
    2.43 +        checkInt("intArgs::clone", intArgs::clone, intArgs);
    2.44 +
    2.45 +        String[] stringArgs = new String[] {"hi", "de", "ho"};
    2.46 +        checkString("String[]::clone", String[]::clone, stringArgs);
    2.47 +        checkString("a -> a.clone()", a -> a.clone(), stringArgs);
    2.48 +        checkString("args::clone", stringArgs::clone, stringArgs);
    2.49 +    }
    2.50 +
    2.51 +    private static void checkInt(String label, Supplier<int[]> s, int[] expected) {
    2.52 +        if (!Arrays.equals(s.get(), expected)) {
    2.53 +            throw new RuntimeException("Unexpected value " + label + ": " + Arrays.toString(s.get()));
    2.54 +        }
    2.55 +    }
    2.56 +
    2.57 +    private static void checkInt(String label, Function<int[], int[]> f, int[] a) {
    2.58 +        checkInt(label, () -> f.apply(a), a);
    2.59 +    }
    2.60 +
    2.61 +    private static void checkString(String label, Supplier<String[]> s, String[] expected) {
    2.62 +        if (!Arrays.equals(s.get(), expected)) {
    2.63 +            throw new RuntimeException("Unexpected value " + label + ": " + Arrays.toString(s.get()));
    2.64 +        }
    2.65 +    }
    2.66 +
    2.67 +    private static void checkString(String label, Function<String[], String[]> f, String[] a) {
    2.68 +        checkString(label, () -> f.apply(a), a);
    2.69 +    }
    2.70 +}