# HG changeset patch # User jlahoda # Date 1382562137 -7200 # Node ID abc3eaccba73d5788be44e8eb0b58ab64928efc8 # Parent 8746caa5cf80f670b4d7d450d303e6230aa5913a 8027191: Fix for JDK-8026861 refers to an incorrect bug number Summary: Reverting changeset b05db8c815e8, so that it can be applied again with a correct bug number Reviewed-by: jjg diff -r 8746caa5cf80 -r abc3eaccba73 src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java --- a/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java Wed Oct 23 13:54:13 2013 -0700 +++ b/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java Wed Oct 23 23:02:17 2013 +0200 @@ -156,15 +156,12 @@ */ private final VarSymbol deserParamSym; - private final JCClassDecl clazz; - - private KlassInfo(JCClassDecl clazz) { - this.clazz = clazz; + private KlassInfo(Symbol kSym) { appendedMethodList = new ListBuffer<>(); deserializeCases = new HashMap>(); MethodType type = new MethodType(List.of(syms.serializedLambdaType), syms.objectType, List.nil(), syms.methodClass); - deserMethodSym = makePrivateSyntheticMethod(STATIC, names.deserializeLambda, type, clazz.sym); + deserMethodSym = makePrivateSyntheticMethod(STATIC, names.deserializeLambda, type, kSym); deserParamSym = new VarSymbol(FINAL, names.fromString("lambda"), syms.serializedLambdaType, deserMethodSym); } @@ -224,16 +221,10 @@ } KlassInfo prevKlassInfo = kInfo; try { - kInfo = new KlassInfo(tree); + kInfo = new KlassInfo(tree.sym); super.visitClassDef(tree); if (!kInfo.deserializeCases.isEmpty()) { - int prevPos = make.pos; - try { - make.at(tree); - kInfo.addMethod(makeDeserializeMethod(tree.sym)); - } finally { - make.at(prevPos); - } + kInfo.addMethod(makeDeserializeMethod(tree.sym)); } //add all translated instance methods here List newMethods = kInfo.appendedMethodList.toList(); @@ -409,21 +400,14 @@ if (context == null || !analyzer.lambdaIdentSymbolFilter(tree.sym)) { super.visitIdent(tree); } else { - int prevPos = make.pos; - try { - make.at(tree); - - LambdaTranslationContext lambdaContext = (LambdaTranslationContext) context; - JCTree ltree = lambdaContext.translate(tree); - if (ltree != null) { - result = ltree; - } else { - //access to untranslated symbols (i.e. compile-time constants, - //members defined inside the lambda body, etc.) ) - super.visitIdent(tree); - } - } finally { - make.at(prevPos); + LambdaTranslationContext lambdaContext = (LambdaTranslationContext) context; + JCTree ltree = lambdaContext.translate(tree); + if (ltree != null) { + result = ltree; + } else { + //access to untranslated symbols (i.e. compile-time constants, + //members defined inside the lambda body, etc.) ) + super.visitIdent(tree); } } } @@ -433,21 +417,11 @@ LambdaTranslationContext lambdaContext = (LambdaTranslationContext)context; if (context != null && lambdaContext.getSymbolMap(LOCAL_VAR).containsKey(tree.sym)) { JCExpression init = translate(tree.init); - int prevPos = make.pos; - try { - result = make.at(tree).VarDef((VarSymbol)lambdaContext.getSymbolMap(LOCAL_VAR).get(tree.sym), init); - } finally { - make.at(prevPos); - } + result = make.VarDef((VarSymbol)lambdaContext.getSymbolMap(LOCAL_VAR).get(tree.sym), init); } else if (context != null && lambdaContext.getSymbolMap(TYPE_VAR).containsKey(tree.sym)) { JCExpression init = translate(tree.init); VarSymbol xsym = (VarSymbol)lambdaContext.getSymbolMap(TYPE_VAR).get(tree.sym); - int prevPos = make.pos; - try { - result = make.at(tree).VarDef(xsym, init); - } finally { - make.at(prevPos); - } + result = make.VarDef(xsym, init); // Replace the entered symbol for this variable Scope sc = tree.sym.owner.members(); if (sc != null) { @@ -474,28 +448,23 @@ boolean isLambda_void = expr.type.hasTag(VOID); boolean isTarget_void = restype.hasTag(VOID); boolean isTarget_Void = types.isSameType(restype, types.boxedClass(syms.voidType).type); - int prevPos = make.pos; - try { - if (isTarget_void) { - //target is void: - // BODY; - JCStatement stat = make.at(expr).Exec(expr); - return make.Block(0, List.of(stat)); - } else if (isLambda_void && isTarget_Void) { - //void to Void conversion: - // BODY; return null; - ListBuffer stats = new ListBuffer<>(); - stats.append(make.at(expr).Exec(expr)); - stats.append(make.Return(make.Literal(BOT, null).setType(syms.botType))); - return make.Block(0, stats.toList()); - } else { - //non-void to non-void conversion: - // return (TYPE)BODY; - JCExpression retExpr = transTypes.coerce(attrEnv, expr, restype); - return make.at(retExpr).Block(0, List.of(make.Return(retExpr))); - } - } finally { - make.at(prevPos); + if (isTarget_void) { + //target is void: + // BODY; + JCStatement stat = make.Exec(expr); + return make.Block(0, List.of(stat)); + } else if (isLambda_void && isTarget_Void) { + //void to Void conversion: + // BODY; return null; + ListBuffer stats = new ListBuffer<>(); + stats.append(make.Exec(expr)); + stats.append(make.Return(make.Literal(BOT, null).setType(syms.botType))); + return make.Block(0, stats.toList()); + } else { + //non-void to non-void conversion: + // return (TYPE)BODY; + JCExpression retExpr = transTypes.coerce(attrEnv, expr, restype); + return make.at(retExpr).Block(0, List.of(make.Return(retExpr))); } } @@ -997,14 +966,8 @@ } } if (context.isSerializable()) { - int prevPos = make.pos; - try { - make.at(kInfo.clazz); - addDeserializationCase(refKind, refSym, tree.type, samSym, - tree, staticArgs, indyType); - } finally { - make.at(prevPos); - } + addDeserializationCase(refKind, refSym, tree.type, samSym, + tree, staticArgs, indyType); } } diff -r 8746caa5cf80 -r abc3eaccba73 test/tools/javac/T8019486/WrongLNTForLambdaTest.java --- a/test/tools/javac/T8019486/WrongLNTForLambdaTest.java Wed Oct 23 13:54:13 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,160 +0,0 @@ -/* - * 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. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * 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 8019486 8026861 - * @summary javac, generates erroneous LVT for a test case with lambda code - * @library /tools/javac/lib - * @build ToolBox - * @run main WrongLNTForLambdaTest - */ - -import java.io.File; -import java.nio.file.Paths; - -import com.sun.tools.classfile.ClassFile; -import com.sun.tools.classfile.Code_attribute; -import com.sun.tools.classfile.LineNumberTable_attribute; -import com.sun.tools.classfile.Method; -import com.sun.tools.javac.util.Assert; - -public class WrongLNTForLambdaTest { - - static final String testSource = - /* 01 */ "import java.util.List;\n" + - /* 02 */ "import java.util.Arrays;\n" + - /* 03 */ "import java.util.stream.Collectors;\n" + - /* 04 */ "\n" + - /* 05 */ "public class Foo {\n" + - /* 06 */ " void bar(int value) {\n" + - /* 07 */ " final List numbers = Arrays.asList(1, 2, 3);\n" + - /* 08 */ " final List numbersPlusOne = \n" + - /* 09 */ " numbers.stream().map(number -> number / 1).collect(Collectors.toList());\n" + - /* 10 */ " }\n" + - /* 11 */ " void variablesInLambdas(int value) {\n" + - /* 12 */ " Runnable r1 = () -> {\n" + - /* 13 */ " int i = value;\n" + - /* 14 */ " class FooBar {\n" + - /* 15 */ " public void run() {\n" + - /* 16 */ " T t = null;\n" + - /* 17 */ " }\n" + - /* 18 */ " }\n" + - /* 19 */ " };\n" + - /* 20 */ " Runnable r2 = () -> System.err.println(1);\n" + - /* 21 */ " Runnable r3 = (Runnable & java.io.Serializable) this::foo;\n" + - /* 22 */ " Runnable r4 = super :: notify;\n" + - /* 23 */ " }\n" + - /* 24 */ " private void foo() {}\n" + - /* 25 */ "}"; - - static final int[][] simpleLambdaExpectedLNT = { - // {line-number, start-pc}, - {9, 0}, //number -> number / 1 - }; - - static final int[][] lambdaWithVarsExpectedLNT = { - // {line-number, start-pc}, - {13, 0}, //number -> number / 1 - {19, 2}, //number -> number / 1 - }; - - static final int[][] insideLambdaWithVarsExpectedLNT = { - // {line-number, start-pc}, - {16, 0}, //number -> number / 1 - {17, 2}, //number -> number / 1 - }; - - static final int[][] lambdaVoid2VoidExpectedLNT = { - // {line-number, start-pc}, - {20, 0}, //number -> number / 1 - }; - - static final int[][] deserializeExpectedLNT = { - // {line-number, start-pc}, - {05, 0}, //number -> number / 1 - }; - - static final int[][] lambdaBridgeExpectedLNT = { - // {line-number, start-pc}, - {22, 0}, //number -> number / 1 - }; - - public static void main(String[] args) throws Exception { - new WrongLNTForLambdaTest().run(); - } - - void run() throws Exception { - compileTestClass(); - checkClassFile(new File(Paths.get(System.getProperty("user.dir"), - "Foo.class").toUri()), "lambda$bar$0", simpleLambdaExpectedLNT); - checkClassFile(new File(Paths.get(System.getProperty("user.dir"), - "Foo.class").toUri()), "lambda$variablesInLambdas$1", lambdaWithVarsExpectedLNT); - checkClassFile(new File(Paths.get(System.getProperty("user.dir"), - "Foo$1FooBar.class").toUri()), "run", insideLambdaWithVarsExpectedLNT); - checkClassFile(new File(Paths.get(System.getProperty("user.dir"), - "Foo.class").toUri()), "lambda$variablesInLambdas$2", lambdaVoid2VoidExpectedLNT); - checkClassFile(new File(Paths.get(System.getProperty("user.dir"), - "Foo.class").toUri()), "$deserializeLambda$", deserializeExpectedLNT); - checkClassFile(new File(Paths.get(System.getProperty("user.dir"), - "Foo.class").toUri()), "lambda$MR$variablesInLambdas$notify$8bc4f5bd$1", lambdaBridgeExpectedLNT); - } - - void compileTestClass() throws Exception { - ToolBox.JavaToolArgs javacSuccessArgs = - new ToolBox.JavaToolArgs().setSources(testSource); - ToolBox.javac(javacSuccessArgs); - } - - void checkClassFile(final File cfile, String methodToFind, int[][] expectedLNT) throws Exception { - ClassFile classFile = ClassFile.read(cfile); - boolean methodFound = false; - for (Method method : classFile.methods) { - if (method.getName(classFile.constant_pool).equals(methodToFind)) { - methodFound = true; - Code_attribute code = (Code_attribute) method.attributes.get("Code"); - LineNumberTable_attribute lnt = - (LineNumberTable_attribute) code.attributes.get("LineNumberTable"); - Assert.check(lnt.line_number_table_length == expectedLNT.length, - "The LineNumberTable found has a length different to the expected one"); - int i = 0; - for (LineNumberTable_attribute.Entry entry: lnt.line_number_table) { - Assert.check(entry.line_number == expectedLNT[i][0] && - entry.start_pc == expectedLNT[i][1], - "LNT entry at pos " + i + " differ from expected." + - "Found " + entry.line_number + ":" + entry.start_pc + - ". Expected " + expectedLNT[i][0] + ":" + expectedLNT[i][1]); - i++; - } - } - } - Assert.check(methodFound, "The seek method was not found"); - } - - void error(String msg) { - throw new AssertionError(msg); - } - -} diff -r 8746caa5cf80 -r abc3eaccba73 test/tools/javac/T8019486/WrongLVTForLambdaTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/T8019486/WrongLVTForLambdaTest.java Wed Oct 23 23:02:17 2013 +0200 @@ -0,0 +1,109 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 8019486 + * @summary javac, generates erroneous LVT for a test case with lambda code + * @library /tools/javac/lib + * @build ToolBox + * @run main WrongLVTForLambdaTest + */ + +import java.io.File; +import java.nio.file.Paths; + +import com.sun.tools.classfile.ClassFile; +import com.sun.tools.classfile.Code_attribute; +import com.sun.tools.classfile.LineNumberTable_attribute; +import com.sun.tools.classfile.Method; +import com.sun.tools.javac.util.Assert; + +public class WrongLVTForLambdaTest { + + static final String testSource = + /* 01 */ "import java.util.List;\n" + + /* 02 */ "import java.util.Arrays;\n" + + /* 03 */ "import java.util.stream.Collectors;\n" + + /* 04 */ "\n" + + /* 05 */ "public class Foo {\n" + + /* 06 */ " void bar(int value) {\n" + + /* 07 */ " final List numbers = Arrays.asList(1, 2, 3);\n" + + /* 08 */ " final List numbersPlusOne = \n" + + /* 09 */ " numbers.stream().map(number -> number / 1).collect(Collectors.toList());\n" + + /* 10 */ " }\n" + + /* 11 */ "}"; + + static final int[][] expectedLNT = { + // {line-number, start-pc}, + {9, 0}, //number -> number / 1 + }; + + public static void main(String[] args) throws Exception { + new WrongLVTForLambdaTest().run(); + } + + void run() throws Exception { + compileTestClass(); + checkClassFile(new File(Paths.get(System.getProperty("user.dir"), + "Foo.class").toUri())); + } + + void compileTestClass() throws Exception { + ToolBox.JavaToolArgs javacSuccessArgs = + new ToolBox.JavaToolArgs().setSources(testSource); + ToolBox.javac(javacSuccessArgs); + } + + void checkClassFile(final File cfile) throws Exception { + ClassFile classFile = ClassFile.read(cfile); + int methodsFound = 0; + for (Method method : classFile.methods) { + if (method.getName(classFile.constant_pool).startsWith("lambda$")) { + ++methodsFound; + Code_attribute code = (Code_attribute) method.attributes.get("Code"); + LineNumberTable_attribute lnt = + (LineNumberTable_attribute) code.attributes.get("LineNumberTable"); + Assert.check(lnt.line_number_table_length == expectedLNT.length, + "The LineNumberTable found has a length different to the expected one"); + int i = 0; + for (LineNumberTable_attribute.Entry entry: lnt.line_number_table) { + Assert.check(entry.line_number == expectedLNT[i][0] && + entry.start_pc == expectedLNT[i][1], + "LNT entry at pos " + i + " differ from expected." + + "Found " + entry.line_number + ":" + entry.start_pc + + ". Expected " + expectedLNT[i][0] + ":" + expectedLNT[i][1]); + i++; + } + } + } + Assert.check(methodsFound == 1, "Expected to find one lambda method, found " + methodsFound); + } + + void error(String msg) { + throw new AssertionError(msg); + } + +}