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

8184989: Incorrect class file created when passing lambda in inner class constructor and outer is subclass

Browse Source 
Reviewed-by: mcimadamore
This commit is contained in:
Srikanth Adayapalam 2017-10-16 14:30:37 +05:30
parent f627304d96
commit b9d8d3bd9c
4 changed files with 192 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,6 +56,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.function.Consumer;
import java.util.function.Supplier;
@ -2096,9 +2097,12 @@ public class LambdaToMethod extends TreeTranslator {
}
break;
case CAPTURED_OUTER_THIS:
if (lambdaIdent.sym.owner.kind == TYP && m.containsKey(lambdaIdent.sym.owner)) {
Optional<Symbol> proxy = m.keySet().stream()
.filter(out -> lambdaIdent.sym.isMemberOf(out.type.tsym, types))
.reduce((a, b) -> a.isEnclosedBy((ClassSymbol)b) ? a : b);
if (proxy.isPresent()) {
// Transform outer instance variable references anchoring them to the captured synthetic.
Symbol tSym = m.get(lambdaIdent.sym.owner);
Symbol tSym = m.get(proxy.get());
JCExpression t = make.Ident(tSym).setType(lambdaIdent.sym.owner.type);
t = make.Select(t, lambdaIdent.name);
t.setType(lambdaIdent.type);

59
test/langtools/tools/javac/lambda/LambdaInSuperCallCapturingOuterThis.java Normal file
View File

@ -0,0 +1,59 @@
/*
* Copyright (c) 2017, 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 8184989
* @summary Incorrect class file created when passing lambda in inner class constructor and outer is subclass
* @run main LambdaInSuperCallCapturingOuterThis
*/
class A8184989 {
public boolean test() {
return true;
}
class AA {
public AA(Condition8184989<AA> condition) {
}
}
}
interface Condition8184989<T> {
boolean check(T t);
}
public class LambdaInSuperCallCapturingOuterThis extends A8184989 {
public LambdaInSuperCallCapturingOuterThis() {
new BA();
}
public class BA extends AA {
public BA() {
super(o -> test());
}
}
public static void main(String[] args) {
LambdaInSuperCallCapturingOuterThis b = new LambdaInSuperCallCapturingOuterThis();
}
}

62
test/langtools/tools/javac/lambda/LambdaInSuperCallCapturingOuterThis2.java Normal file
View File

@ -0,0 +1,62 @@
/*
* Copyright (c) 2017, 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 8184989
* @summary Incorrect class file created when passing lambda in inner class constructor and outer is subclass
* @run main LambdaInSuperCallCapturingOuterThis2
*/
class A8184989_2 {
public boolean test() {
return true;
}
class AA {
public AA(Condition8184989_2<AA> condition) {
if (condition.check(this) != true) {
throw new AssertionError("Incorrect output");
}
}
}
}
interface Condition8184989_2<T> {
boolean check(T t);
}
public class LambdaInSuperCallCapturingOuterThis2 extends A8184989_2 {
public boolean test() {return false;}
public void b() {}
class C extends A8184989_2 {
public class BA extends AA {
public BA() {
super(o -> {b(); return test();});
}
}
}
public static void main(String[] args) {
new LambdaInSuperCallCapturingOuterThis2().new C().new BA();
}
}

65
test/langtools/tools/javac/lambda/LambdaInSuperCallCapturingOuterThis3.java Normal file
View File

@ -0,0 +1,65 @@
/*
* Copyright (c) 2017, 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 8184989
* @summary Incorrect class file created when passing lambda in inner class constructor and outer is subclass
* @run main LambdaInSuperCallCapturingOuterThis3
*/
interface I8184989_3 {
public default boolean test(){
return true;
}
}
class A8184989_3 implements I8184989_3 {
class AA {
public AA(Condition8184989_3<AA> condition) {
if (condition.check(this) != true) {
throw new AssertionError("Incorrect output");
}
}
}
}
interface Condition8184989_3<T> {
boolean check(T t);
}
public class LambdaInSuperCallCapturingOuterThis3 extends A8184989_3 {
public boolean test() {return false;}
public void b() {}
class C extends A8184989_3 {
public class BA extends AA {
public BA() {
super(o -> {b(); return test();});
}
}
}
public static void main(String[] args) {
new LambdaInSuperCallCapturingOuterThis3().new C().new BA();
}
}