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

6682380: Foreach loop with generics inside finally block crashes javac with -target 1.5

Browse Source 
A missing type-erasure in Lower.java causes the compiler to crash since JDK6

Reviewed-by: jjg
This commit is contained in:
Maurizio Cimadamore 2008-04-23 17:10:03 +01:00
parent 01af1b8223
commit c2e37f139a
2 changed files with 58 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java
View File

@ -2863,13 +2863,15 @@ public class Lower extends TreeTranslator {
JCExpressionStatement step = make.Exec(makeUnary(JCTree.PREINC, make.Ident(index)));
Type elemtype = types.elemtype(tree.expr.type);
JCStatement loopvarinit = make.
VarDef(tree.var.sym,
make.
Indexed(make.Ident(arraycache), make.Ident(index)).
setType(elemtype));
JCExpression loopvarinit = make.Indexed(make.Ident(arraycache),
make.Ident(index)).setType(elemtype);
JCVariableDecl loopvardef = (JCVariableDecl)make.VarDef(tree.var.mods,
tree.var.name,
tree.var.vartype,
loopvarinit).setType(tree.var.type);
loopvardef.sym = tree.var.sym;
JCBlock body = make.
Block(0, List.of(loopvarinit, tree.body));
Block(0, List.of(loopvardef, tree.body));
result = translate(make.
ForLoop(loopinit,
@ -2944,7 +2946,11 @@ public class Lower extends TreeTranslator {
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);
JCVariableDecl indexDef = (JCVariableDecl)make.VarDef(tree.var.mods,
tree.var.name,
tree.var.vartype,
vardefinit).setType(tree.var.type);
indexDef.sym = tree.var.sym;
JCBlock body = make.Block(0, List.of(indexDef, tree.body));
result = translate(make.
ForLoop(List.of(init),

45
langtools/test/tools/javac/foreach/T6682380.java Normal file
View File

@ -0,0 +1,45 @@
/*
* 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 6682380 6679509
* @summary Foreach loop with generics inside finally block crashes javac with -target 1.5
* @author Jan Lahoda, Maurizio Cimadamore
* @compile -target 1.5 T6682380.java
*/
import java.util.List;
public class T6682380<X> {
public static void main(String[] args) {
try {
} finally {
List<T6682380<?>> l = null;
T6682380<?>[] a = null;
for (T6682380<?> e1 : l);
for (T6682380<?> e2 : a);
}
}
}