diff -r f4afc37a97a2 -r fdb441b50289 langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java --- a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java Thu Nov 14 12:32:57 2013 -0500 +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java Thu Nov 14 19:28:20 2013 +0000 @@ -4602,9 +4602,8 @@ validateAnnotatedType(t, t.type); } repeat = false; - } else if (enclTr.getKind() == JCTree.Kind.PRIMITIVE_TYPE) { - // This happens in test TargetTypeTest52.java - // Is there anything to do? + } else if (enclTr.getKind() == JCTree.Kind.PRIMITIVE_TYPE || + enclTr.getKind() == JCTree.Kind.ERRONEOUS) { repeat = false; } else { Assert.error("Unexpected tree: " + enclTr + " with kind: " + enclTr.getKind() +