archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 11:04:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8139836: Can't use super::x method reference when x is protected

Browse source 
Javac incorrectly diasllows reference to a protected method from a super class in method reference expressions.

Reviewed-by: mcimadamore
This commit is contained in:
Srikanth Adayapalam 2015-10-20 15:25:41 +05:30
parent a21102b5f4
commit 08b811e8d6
4 changed files with 89 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ArgumentAttr.java
View file

@ -263,6 +263,8 @@ public class ArgumentAttr extends JCTree.Visitor {
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);

4
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
View file

@ -2817,8 +2817,10 @@ public class Attr extends JCTree.Visitor {
//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) {

51
langtools/test/tools/javac/lambda/MethodReference74.java Normal file
View file

@ -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);
}
}
}

33
langtools/test/tools/javac/lambda/pkg/Parent.java Normal file
View file

@ -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 ";
}
}