diff --git a/src/share/classes/com/sun/tools/javac/comp/Lower.java b/src/share/classes/com/sun/tools/javac/comp/Lower.java --- a/src/share/classes/com/sun/tools/javac/comp/Lower.java +++ b/src/share/classes/com/sun/tools/javac/comp/Lower.java @@ -2944,7 +2944,15 @@ JCExpression vardefinit = make.App(make.Select(make.Ident(itvar), next)); if (iteratorTarget != syms.objectType) vardefinit = make.TypeCast(iteratorTarget, vardefinit); - JCVariableDecl indexDef = make.VarDef(tree.var.sym, vardefinit); + + Type indexDefType = types.erasure(tree.var.sym.type); + JCVariableDecl indexDef = make.VarDef( + make.Modifiers(tree.var.sym.flags(), make.Annotations(tree.var.sym.getAnnotationMirrors())), + tree.var.sym.name, + make.Type(indexDefType), + vardefinit); + indexDef.sym = tree.var.sym; + indexDef.setType(indexDefType); JCBlock body = make.Block(0, List.of(indexDef, tree.body)); result = translate(make. ForLoop(List.of(init), diff --git a/test/tools/javac/T6679509.java b/test/tools/javac/T6679509.java new file mode 100644 --- /dev/null +++ b/test/tools/javac/T6679509.java @@ -0,0 +1,44 @@ +/* + * Copyright 2008 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +/* + * @test + * @bug 6679509 + * @author Jan Lahoda + * @compile -target 1.5 T6679509.java + */ + +import java.util.List; + +public class T6679509 { + + public static void main(String[] args) { + try { + } finally { + List> l = null; + for (List textRegion : l) { + } + } + } + +}