infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-14 18:03:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

8234729: Javac should eagerly change code generation for method references to avert IllegalAccessError in future

Browse Source 
Reviewed-by: mcimadamore
This commit is contained in:
Srikanth Adayapalam 2019-11-26 11:13:53 +05:30
parent 5df8729406
commit 05ca3218d9
4 changed files with 143 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
View File

@ -2266,8 +2266,7 @@ public class LambdaToMethod extends TreeTranslator {
boolean isProtectedInSuperClassOfEnclosingClassInOtherPackage() {
return ((tree.sym.flags() & PROTECTED) != 0 &&
tree.sym.packge() != owner.packge() &&
!owner.enclClass().isSubClass(tree.sym.owner, types));
tree.sym.packge() != owner.packge());
}
/**

67
test/langtools/tools/javac/lambda/methodReference/ProtectedInaccessibleMethodRefTest2.java Normal file
View File

@ -0,0 +1,67 @@
/*
* Copyright (c) 2019, 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 8234729
* @summary Javac should eagerly change code generation for method references to avert IllegalAccessError in future.
* @run main ProtectedInaccessibleMethodRefTest2
*/
import pack.I;
import pack.J;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.function.Function;
import java.lang.reflect.Method;
import java.util.concurrent.Callable;
public final class ProtectedInaccessibleMethodRefTest2 extends I {
public static void main(String... args) {
ProtectedInaccessibleMethodRefTest2 m = new ProtectedInaccessibleMethodRefTest2();
m.test(Paths.get("test"));
// Verify that the method reference has been folded into a lambda.
boolean lambdaFound = false;
for (Method meth : ProtectedInaccessibleMethodRefTest2.class.getDeclaredMethods()) {
if (meth.getName().equals("lambda$test$0")) {
lambdaFound = true;
break;
}
}
if (!lambdaFound) {
throw new AssertionError("Did not find evidence of new code generation");
}
}
void test(Path outputDir) {
Sub c = new Sub(this::readFile);
c.check(outputDir);
}
public class Sub extends J {
Sub(Function<Path,String> fileReader) {
super(fileReader);
}
}
}

32
test/langtools/tools/javac/lambda/methodReference/pack/I.java Normal file
View File

@ -0,0 +1,32 @@
/*
* Copyright (c) 2019, 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 pack;
import java.nio.file.Path;
public class I {
protected String readFile(Path file) {
return file.toString();
}
}

43
test/langtools/tools/javac/lambda/methodReference/pack/J.java Normal file
View File

@ -0,0 +1,43 @@
/*
* Copyright (c) 2019, 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 pack;
import java.nio.file.Path;
import java.util.function.Function;
public class J {
protected final Function<Path,String> fileReader;
public J(Function<Path,String> fileReader) {
this.fileReader = fileReader;
}
protected void checkFile(Path file) {
fileReader.apply(file);
}
public void check(Path file) {
checkFile(file);
}
}