Fri, 29 Oct 2010 12:47:49 -0700
6993304: JavacTrees.getAttrContext not updated to Tree.Kind.{ANNOTATION_TYPE,ENUM,INTERFACE}
Reviewed-by: mcimadamore
1.1 --- a/src/share/classes/com/sun/tools/javac/api/JavacTrees.java Thu Oct 28 18:58:43 2010 -0700 1.2 +++ b/src/share/classes/com/sun/tools/javac/api/JavacTrees.java Fri Oct 29 12:47:49 2010 -0700 1.3 @@ -282,9 +282,10 @@ 1.4 // System.err.println("COMP: " + ((JCCompilationUnit)tree).sourcefile); 1.5 env = enter.getTopLevelEnv((JCCompilationUnit)tree); 1.6 break; 1.7 + case ANNOTATION_TYPE: 1.8 case CLASS: 1.9 + case ENUM: 1.10 case INTERFACE: 1.11 - case ENUM: 1.12 // System.err.println("CLASS: " + ((JCClassDecl)tree).sym.getSimpleName()); 1.13 env = enter.getClassEnv(((JCClassDecl)tree).sym); 1.14 break;
2.1 --- a/src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java Thu Oct 28 18:58:43 2010 -0700 2.2 +++ b/src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java Fri Oct 29 12:47:49 2010 -0700 2.3 @@ -113,9 +113,10 @@ 2.4 p.pos = frame.pos; 2.5 return p; 2.6 2.7 + case ANNOTATION_TYPE: 2.8 case CLASS: 2.9 + case ENUM: 2.10 case INTERFACE: 2.11 - case ENUM: 2.12 p.pos = frame.pos; 2.13 if (((JCClassDecl)frame).extending == tree) { 2.14 p.type = TargetType.CLASS_EXTENDS;