archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-19 18:44:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8052070: javac crashes when there are duplicated type parameters

Browse source 
Avoid eager completion of ClassSymbol while type parameters are being processed.

Reviewed-by: jlahoda, mcimadamore
This commit is contained in:
Srikanth Adayapalam 2015-01-20 09:51:17 +01:00 • committed by Jan Lahoda
parent ca4dba303f
commit 671f90ddc7
3 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Enter.java
View file

@ -385,7 +385,7 @@ public class Enter extends JCTree.Visitor {
typeEnvs.put(c, localEnv); typeEnvs.put(c, localEnv);
// Fill out class fields. // Fill out class fields.
c.completer = typeEnter; c.completer = null; // do not allow the initial completer linger on.
c.flags_field = chk.checkFlags(tree.pos(), tree.mods.flags, c, tree); c.flags_field = chk.checkFlags(tree.pos(), tree.mods.flags, c, tree);
c.sourcefile = env.toplevel.sourcefile; c.sourcefile = env.toplevel.sourcefile;
c.members_field = WriteableScope.create(c); c.members_field = WriteableScope.create(c);
@ -409,6 +409,9 @@ public class Enter extends JCTree.Visitor {
// Enter type parameters. // Enter type parameters.
ct.typarams_field = classEnter(tree.typarams, localEnv); ct.typarams_field = classEnter(tree.typarams, localEnv);
// install further completer for this type.
c.completer = typeEnter;
// Add non-local class to uncompleted, to make sure it will be // Add non-local class to uncompleted, to make sure it will be
// completed later. // completed later.
if (!c.isLocal() && uncompleted != null) uncompleted.append(c); if (!c.isLocal() && uncompleted != null) uncompleted.append(c);

15
langtools/test/tools/javac/8052070/DuplicateTypeParameter.java Normal file
View file

@ -0,0 +1,15 @@
/*
* @test /nodynamiccopyright/
* @bug 8052070
* @summary javac crashes when there are duplicated type parameters
* @compile/fail/ref=DuplicateTypeParameter.out -XDrawDiagnostics DuplicateTypeParameter.java
*/
public class DuplicateTypeParameter<T, T, A> {
class Inner <P, P, Q> {}
public void foo() {
class Local <M, M, N> {};
}
}
class Secondary<D, D, E> {}

5
langtools/test/tools/javac/8052070/DuplicateTypeParameter.out Normal file
View file

@ -0,0 +1,5 @@
DuplicateTypeParameter.java:8:40: compiler.err.already.defined: kindname.type.variable, T, kindname.class, DuplicateTypeParameter
DuplicateTypeParameter.java:9:21: compiler.err.already.defined: kindname.type.variable, P, kindname.class, DuplicateTypeParameter.Inner
DuplicateTypeParameter.java:15:20: compiler.err.already.defined: kindname.type.variable, D, kindname.class, Secondary
DuplicateTypeParameter.java:11:25: compiler.err.already.defined: kindname.type.variable, M, kindname.class, Local
4 errors