OpenJDK / jdk / jdk
changeset 33363:f03a03067799
8139836: Can't use super::x method reference when x is protected
Summary: Javac incorrectly diasllows reference to a protected method from a super class in method reference expressions.
Reviewed-by: mcimadamore
author | sadayapalam |
---|---|
date | Tue, 20 Oct 2015 15:25:41 +0530 |
parents | 65ec6de1d6b4 |
children | 542040bb5990 |
files | langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ArgumentAttr.java langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java langtools/test/tools/javac/lambda/MethodReference74.java langtools/test/tools/javac/lambda/pkg/Parent.java |
diffstat | 4 files changed, 89 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ArgumentAttr.java Mon Oct 19 19:15:16 2015 +0200 +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ArgumentAttr.java Tue Oct 20 15:25:41 2015 +0530 @@ -263,6 +263,8 @@ attr.memberReferenceQualifierResult(tree)); JCMemberReference mref2 = new TreeCopier<Void>(attr.make).copy(tree); mref2.expr = exprTree; + Symbol lhsSym = TreeInfo.symbol(exprTree); + localEnv.info.selectSuper = lhsSym != null && lhsSym.name == lhsSym.name.table.names._super; Symbol res = attr.rs.getMemberReference(tree, localEnv, mref2, exprTree.type, tree.name);
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java Mon Oct 19 19:15:16 2015 +0200 +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java Tue Oct 20 15:25:41 2015 +0530 @@ -2817,8 +2817,10 @@ //omitted as we don't know at this stage as to whether this is a //raw selector (because of inference) chk.validate(that.expr, env, false); + } else { + Symbol lhsSym = TreeInfo.symbol(that.expr); + localEnv.info.selectSuper = lhsSym != null && lhsSym.name == names._super; } - //attrib type-arguments List<Type> typeargtypes = List.nil(); if (that.typeargs != null) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/tools/javac/lambda/MethodReference74.java Tue Oct 20 15:25:41 2015 +0530 @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8139836 + * @summary Can't use super::x method reference when x is protected + * @run main MethodReference74 + */ + +public class MethodReference74 extends pkg.Parent { + + public void protectedMethod() { + log = "In child, calling ... "; + Runnable r = super::protectedMethod; + r.run(); + run(super::protectedMethod); // test also in invocation context. + } + + private void run(Runnable r) { + r.run(); + } + + public static void main(String[] args) { + MethodReference74 child = new MethodReference74(); + child.protectedMethod(); + if (!child.log.equals("In child, calling ... parent's parent's ")) { + throw new AssertionError("Unexpected output" + child.log); + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/tools/javac/lambda/pkg/Parent.java Tue Oct 20 15:25:41 2015 +0530 @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package pkg; + +public class Parent { + + public String log; + + protected void protectedMethod() { + log += " parent's "; + } +}