Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java	Mon Jan 18 10:58:12 2016 +0000
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java	Fri Jan 22 10:49:45 2016 +0300
     1.3 @@ -877,11 +877,9 @@
     1.4           */
     1.5          private JCExpression expressionInvoke(VarSymbol rcvr) {
     1.6              JCExpression qualifier =
     1.7 -                    tree.sym.isStatic() ?
     1.8 -                        make.Type(tree.sym.owner.type) :
     1.9 -                        (rcvr != null) ?
    1.10 -                            makeReceiver(rcvr) :
    1.11 -                            tree.getQualifierExpression();
    1.12 +                    (rcvr != null) ?
    1.13 +                        makeReceiver(rcvr) :
    1.14 +                        tree.getQualifierExpression();
    1.15  
    1.16              //create the qualifier expression
    1.17              JCFieldAccess select = make.Select(qualifier, tree.sym.name);

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/tools/javac/lambda/methodReferenceExecution/MethodReferencePackagePrivateQualifier.java	Fri Jan 22 10:49:45 2016 +0300
     2.3 @@ -0,0 +1,42 @@
     2.4 +/*
     2.5 + * Copyright (c) 2015, 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 8068254
    2.30 + * @summary Method reference uses wrong qualifying type
    2.31 + * @author srikanth
    2.32 + * @run main MethodReferencePackagePrivateQualifier
    2.33 + */
    2.34 +import pkg.B;
    2.35 +public class MethodReferencePackagePrivateQualifier {
    2.36 +    public static void main(String... args) {
    2.37 +        pkg.B.m();
    2.38 +        Runnable r = pkg.B::m;
    2.39 +        r.run();
    2.40 +        r = B::m;
    2.41 +        r.run();
    2.42 +        if (!pkg.B.result.equals("A.m()A.m()A.m()"))
    2.43 +            throw new AssertionError("Incorrect result");
    2.44 +    }
    2.45 +}

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/test/tools/javac/lambda/methodReferenceExecution/pkg/B.java	Fri Jan 22 10:49:45 2016 +0300
     3.3 @@ -0,0 +1,33 @@
     3.4 +/*
     3.5 + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
     3.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.7 + *
     3.8 + * This code is free software; you can redistribute it and/or modify it
     3.9 + * under the terms of the GNU General Public License version 2 only, as
    3.10 + * published by the Free Software Foundation.
    3.11 + *
    3.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
    3.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    3.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    3.15 + * version 2 for more details (a copy is included in the LICENSE file that
    3.16 + * accompanied this code).
    3.17 + *
    3.18 + * You should have received a copy of the GNU General Public License version
    3.19 + * 2 along with this work; if not, write to the Free Software Foundation,
    3.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    3.21 + *
    3.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    3.23 + * or visit www.oracle.com if you need additional information or have any
    3.24 + * questions.
    3.25 + */
    3.26 +
    3.27 +package pkg;
    3.28 +class A {
    3.29 +    public static void m() {
    3.30 +        B.result += "A.m()";
    3.31 +    }
    3.32 +}
    3.33 +
    3.34 +public class B extends A {
    3.35 +    public static String result = "";
    3.36 +}