diff -r 000000000000 -r 959103a6100f test/tools/javac/lambda/LambdaInnerTypeVarReflect.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/LambdaInnerTypeVarReflect.java Wed Apr 27 01:34:52 2016 +0800 @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2013, 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 8005653 + * @summary A lambda containing an inner class referencing an external type var + * @author Robert Field + * @run main LambdaInnerTypeVarReflect + */ + +import java.io.StringWriter; +import java.io.PrintWriter; +import java.io.IOException; + +public class LambdaInnerTypeVarReflect { + + static int assertionCount = 0; + + static void assertTrue(boolean cond) { + assertionCount++; + if (!cond) + throw new AssertionError(); + } + + interface I { + C doit(); + } + + abstract class C { + abstract Object it(); + } + + class TV { + C go() { + return foo("Frump").doit(); + } + + I foo(RRRRR r) { + return () -> new C() { + public RRRRR xxxxx = r; + @Override + Object it() { return xxxxx; }; + }; + } + } + + void test1() throws IOException { + char[] buffer = new char[1024]; + String innerName = new TV().go().getClass().getName(); + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw); + int exitCode = com.sun.tools.javap.Main.run(new String[] {innerName}, pw); + assertTrue(exitCode == 0); + + String javapOut = sw.toString(); + assertTrue(javapOut.contains(innerName)); + assertTrue(!javapOut.contains("RRRRR")); + } + + public static void main(String[] args) throws IOException { + LambdaInnerTypeVarReflect t = new LambdaInnerTypeVarReflect(); + t.test1(); + assertTrue(assertionCount == 3); + } +}