From 27ba529c7d802f63526f3ffe0109709a9e2fe596 Mon Sep 17 00:00:00 2001 From: rfield Date: Tue, 13 Nov 2012 08:06:00 -0800 Subject: [PATCH] 8003306: Compiler crash: calculation of inner class access modifier Summary: Fix binary sense lost in transition to hasTag Reviewed-by: mcimadamore --- .../sun/tools/javac/comp/LambdaToMethod.java | 4 +- test/tools/javac/lambda/InnerConstructor.java | 48 +++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 test/tools/javac/lambda/InnerConstructor.java diff --git a/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java b/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java index faf421af..a4cf5cea 100644 --- a/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java +++ b/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java @@ -1120,10 +1120,10 @@ public class LambdaToMethod extends TreeTranslator { if (context != null && tree.encl == null && tree.def == null - && tree.type.getEnclosingType().hasTag(NONE)) { + && !tree.type.getEnclosingType().hasTag(NONE)) { Type encl = tree.type.getEnclosingType(); Type current = context.owner.enclClass().type; - while (current.hasTag(NONE)) { + while (!current.hasTag(NONE)) { if (current.tsym.isSubClass(encl.tsym, types)) { return true; } diff --git a/test/tools/javac/lambda/InnerConstructor.java b/test/tools/javac/lambda/InnerConstructor.java new file mode 100644 index 00000000..6a5bf984 --- /dev/null +++ b/test/tools/javac/lambda/InnerConstructor.java @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2012, 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 + * @summary Regression test JDK-8003306 inner class constructor in lambda + * @author Robert Field + * @compile -XDallowLambda InnerConstructor.java + */ + +class InnerConstructor { + + public void testLambdaWithInnerConstructor() { + System.out.printf("%s should be %s\n", seq1().m().toString(), "Cbl:nada"); + } + + Ib1 seq1() { + return () -> new Cbl(); + } + + class Cbl { + Cbl() { } + } + + interface Ib1 { + Object m(); + } +} -- GitLab