stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8336786: VerifyError with lambda capture and enclosing instance references

Browse Source 
Reviewed-by: mcimadamore
This commit is contained in:
Liam Miller-Cushon 2024-07-19 21:52:45 +00:00
parent 3ade2b6114
commit 939fe000a9
4 changed files with 82 additions and 3 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

@ -1291,12 +1291,13 @@ public class LambdaToMethod extends TreeTranslator {
* in nested scopes (which do not need to undergo capture).
*/
private JCTree capturedDecl(int depth, Symbol sym) {
Assert.check(sym.kind != TYP);
int currentDepth = frameStack.size() - 1;
for (Frame block : frameStack) {
switch (block.tree.getTag()) {
case CLASSDEF:
ClassSymbol clazz = ((JCClassDecl)block.tree).sym;
if (clazz.isSubClass(sym, types) || sym.isMemberOf(clazz, types)) {
if (clazz.isSubClass(sym.enclClass(), types)) {
return currentDepth > depth ? null : block.tree;
}
break;

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

@ -1828,11 +1828,10 @@ public class Lower extends TreeTranslator {
* due to protection?
*/
JCExpression makeOwnerThis(DiagnosticPosition pos, Symbol sym, boolean preciseMatch) {
Symbol c = sym.owner;
if (preciseMatch ? sym.isMemberOf(currentClass, types)
: currentClass.isSubClass(sym.owner, types)) {
// in this case, `this' works fine
return make.at(pos).This(c.erasure(types));
return make.at(pos).This(currentClass.erasure(types));
} else {
// need to go via this$n
return makeOwnerThisN(pos, sym, preciseMatch);

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

@ -0,0 +1,51 @@
/*
* Copyright (c) 2024, Alphabet LLC. 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 8336786
* @summary VerifyError with lambda capture and enclosing instance references
* @compile a/A.java SuperClassThisCapture.java
* @run main SuperClassThisCapture
*/
public class SuperClassThisCapture extends a.A {
public static void main(String[] args) {
new SuperClassThisCapture().f(42);
new SuperClassThisCapture().g();
}
public void f(int x) {
Runnable r = () -> {
System.err.println(x);
new I();
};
r.run();
}
public void g() {
Runnable r = () -> new I();
r.run();
}
}

28
test/langtools/tools/javac/lambda/SuperClassThisCapture/a/A.java Normal file
View File

@ -0,0 +1,28 @@
/*
* Copyright (c) 2024, Alphabet LLC. 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 a;
public class A {
public class I {}
}