--- old/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.java Thu Aug 8 17:33:15 2013 +++ new/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.java Thu Aug 8 17:33:15 2013 @@ -5,7 +5,7 @@ * @author Werner Dietl * @compile/fail/ref=AnnotatedImport.out -XDrawDiagnostics AnnotatedImport.java */ - +import java.lang.annotation.*; import java.@A util.List; import @A java.util.Map; import java.util.@A HashMap; @@ -12,4 +12,5 @@ class AnnotatedImport { } +@Target(ElementType.TYPE_USE) @interface A { } --- old/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage1.java Thu Aug 8 17:33:16 2013 +++ new/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage1.java Thu Aug 8 17:33:16 2013 @@ -5,9 +5,12 @@ * @author Werner Dietl * @compile/fail/ref=AnnotatedPackage1.out -XDrawDiagnostics AnnotatedPackage1.java */ - + package name.@A p1.p2; +import java.lang.annotation.*; + class AnnotatedPackage1 { } +@Target(ElementType.TYPE_USE) @interface A { } --- old/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage2.java Thu Aug 8 17:33:17 2013 +++ new/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage2.java Thu Aug 8 17:33:17 2013 @@ -5,9 +5,12 @@ * @author Werner Dietl * @compile/fail/ref=AnnotatedPackage2.out -XDrawDiagnostics AnnotatedPackage2.java */ - + package @A p1.p2; +import java.lang.annotation.*; + class AnnotatedPackage2 { } +@Target(ElementType.TYPE_USE) @interface A { } --- old/test/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.java Thu Aug 8 17:33:19 2013 +++ new/test/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.java Thu Aug 8 17:33:19 2013 @@ -6,8 +6,11 @@ * @compile/fail/ref=AnnotationVersion.out -XDrawDiagnostics -Xlint:-options -source 1.6 AnnotationVersion.java * @compile/fail/ref=AnnotationVersion7.out -XDrawDiagnostics -Xlint:-options -source 1.7 AnnotationVersion.java */ +import java.lang.annotation.*; + class AnnotationVersion { public void method(@A AnnotationVersion this) { } } +@Target(ElementType.TYPE_USE) @interface A { } --- old/test/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.out Thu Aug 8 17:33:20 2013 +++ new/test/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.out Thu Aug 8 17:33:20 2013 @@ -1,2 +1,2 @@ -AnnotationVersion.java:10:43: compiler.err.type.annotations.not.supported.in.source: 1.6 +AnnotationVersion.java:12:43: compiler.err.type.annotations.not.supported.in.source: 1.6 1 error --- old/test/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion7.out Thu Aug 8 17:33:21 2013 +++ new/test/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion7.out Thu Aug 8 17:33:21 2013 @@ -1,2 +1,2 @@ -AnnotationVersion.java:10:43: compiler.err.type.annotations.not.supported.in.source: 1.7 +AnnotationVersion.java:12:43: compiler.err.type.annotations.not.supported.in.source: 1.7 1 error --- old/test/tools/javac/annotations/typeAnnotations/failures/BadCast.java Thu Aug 8 17:33:23 2013 +++ new/test/tools/javac/annotations/typeAnnotations/failures/BadCast.java Thu Aug 8 17:33:22 2013 @@ -5,6 +5,8 @@ * @author Werner Dietl * @compile/fail/ref=BadCast.out -XDrawDiagnostics BadCast.java */ +import java.lang.annotation.*; + class BadCast { static void main() { Object o = (@A) ""; @@ -11,4 +13,5 @@ } } +@Target(ElementType.TYPE_USE) @interface A { } --- old/test/tools/javac/annotations/typeAnnotations/failures/BadCast.out Thu Aug 8 17:33:24 2013 +++ new/test/tools/javac/annotations/typeAnnotations/failures/BadCast.out Thu Aug 8 17:33:23 2013 @@ -1,2 +1,2 @@ -BadCast.java:10:19: compiler.err.illegal.start.of.type -1 error +BadCast.java:12:19: compiler.err.illegal.start.of.type +1 error --- old/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass.java Thu Aug 8 17:33:24 2013 +++ new/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass.java Thu Aug 8 17:33:24 2013 @@ -1,7 +1,6 @@ /* * @test /nodynamiccopyright/ - * @bug 8006733 8006775 - * @ignore 8013409: test failures for type annotations + * @bug 8006733 8006775 8013409 * @summary A static outer class cannot be annotated. * @author Werner Dietl * @compile/fail/ref=CantAnnotateStaticClass.out -XDrawDiagnostics CantAnnotateStaticClass.java --- old/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass.out Thu Aug 8 17:33:25 2013 +++ new/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass.out Thu Aug 8 17:33:25 2013 @@ -1,1 +1,10 @@ -dummy +CantAnnotateStaticClass.java:21:20: compiler.err.cant.annotate.static.class +CantAnnotateStaticClass.java:22:13: compiler.err.cant.annotate.static.class +CantAnnotateStaticClass.java:23:29: compiler.err.cant.annotate.static.class +CantAnnotateStaticClass.java:25:29: compiler.err.cant.annotate.static.class +CantAnnotateStaticClass.java:28:26: compiler.err.cant.annotate.static.class +CantAnnotateStaticClass.java:29:9: compiler.err.cant.annotate.static.class +CantAnnotateStaticClass.java:30:35: compiler.err.cant.annotate.static.class +- compiler.note.unchecked.filename: CantAnnotateStaticClass.java +- compiler.note.unchecked.recompile +7 errors --- old/test/tools/javac/annotations/typeAnnotations/failures/IncompleteArray.java Thu Aug 8 17:33:26 2013 +++ new/test/tools/javac/annotations/typeAnnotations/failures/IncompleteArray.java Thu Aug 8 17:33:26 2013 @@ -5,8 +5,11 @@ * @author Mahmood Ali * @compile/fail/ref=IncompleteArray.out -XDrawDiagnostics IncompleteArray.java */ +import java.lang.annotation.*; + class IncompleteArray { int @A [] @A var; } +@Target(ElementType.TYPE_USE) @interface A { } --- old/test/tools/javac/annotations/typeAnnotations/failures/IncompleteArray.out Thu Aug 8 17:33:27 2013 +++ new/test/tools/javac/annotations/typeAnnotations/failures/IncompleteArray.out Thu Aug 8 17:33:27 2013 @@ -1,2 +1,2 @@ -IncompleteArray.java:9:13: compiler.err.illegal.start.of.type +IncompleteArray.java:11:13: compiler.err.illegal.start.of.type 1 error --- old/test/tools/javac/annotations/typeAnnotations/failures/IncompleteVararg.java Thu Aug 8 17:33:28 2013 +++ new/test/tools/javac/annotations/typeAnnotations/failures/IncompleteVararg.java Thu Aug 8 17:33:28 2013 @@ -5,9 +5,12 @@ * @author Mahmood Ali * @compile/fail/ref=IncompleteVararg.out -XDrawDiagnostics IncompleteVararg.java */ +import java.lang.annotation.*; + class IncompleteArray { // the last variable may be vararg void method(int @A test) { } } +@Target(ElementType.TYPE_USE) @interface A { } --- old/test/tools/javac/annotations/typeAnnotations/failures/IncompleteVararg.out Thu Aug 8 17:33:29 2013 +++ new/test/tools/javac/annotations/typeAnnotations/failures/IncompleteVararg.out Thu Aug 8 17:33:29 2013 @@ -1,2 +1,2 @@ -IncompleteVararg.java:10:19: compiler.err.illegal.start.of.type +IncompleteVararg.java:12:19: compiler.err.illegal.start.of.type 1 error --- old/test/tools/javac/annotations/typeAnnotations/failures/IndexArray.java Thu Aug 8 17:33:30 2013 +++ new/test/tools/javac/annotations/typeAnnotations/failures/IndexArray.java Thu Aug 8 17:33:30 2013 @@ -5,9 +5,12 @@ * @author Mahmood Ali * @compile/fail/ref=IndexArray.out -XDrawDiagnostics IndexArray.java */ +import java.lang.annotation.*; + class IndexArray { int[] var; int a = var @A [1]; } +@Target(ElementType.TYPE_USE) @interface A { } --- old/test/tools/javac/annotations/typeAnnotations/failures/IndexArray.out Thu Aug 8 17:33:31 2013 +++ new/test/tools/javac/annotations/typeAnnotations/failures/IndexArray.out Thu Aug 8 17:33:30 2013 @@ -1,2 +1,2 @@ -IndexArray.java:10:15: compiler.err.illegal.start.of.expr +IndexArray.java:12:15: compiler.err.illegal.start.of.expr 1 error --- old/test/tools/javac/annotations/typeAnnotations/failures/OldArray.java Thu Aug 8 17:33:31 2013 +++ new/test/tools/javac/annotations/typeAnnotations/failures/OldArray.java Thu Aug 8 17:33:31 2013 @@ -28,8 +28,11 @@ * @author Mahmood Ali * @compile/fail -XDrawDiagnostics OldArray.java */ +import java.lang.annotation.*; + class OldArray { String [@A] s() { return null; } } +@Target(ElementType.TYPE_USE) @interface A { } --- old/test/tools/javac/annotations/typeAnnotations/failures/Scopes.java Thu Aug 8 17:33:32 2013 +++ new/test/tools/javac/annotations/typeAnnotations/failures/Scopes.java Thu Aug 8 17:33:32 2013 @@ -6,12 +6,12 @@ * @compile/fail/ref=Scopes.out -XDrawDiagnostics Scopes.java */ class Scopes { - // UniqueInner is not visible in the type parameters. - // One has to use Scopes.UniqueInner. - // Annotations with the default @Target are not allowed there, - // so we also get the second error about the invalid location. - // Adding the target here doesn't matter, as we don't resolve - // the annotation type. - // @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) - @interface UniqueInner { }; + // UniqueInner is not visible in the type parameters. + // One has to use Scopes.UniqueInner. + // Annotations with the default @Target are not allowed there, + // so we also get the second error about the invalid location. + // Adding the target here doesn't matter, as we don't resolve + // the annotation type. + //@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) + @interface UniqueInner { }; } --- old/test/tools/javac/annotations/typeAnnotations/failures/StaticFields.java Thu Aug 8 17:33:33 2013 +++ new/test/tools/javac/annotations/typeAnnotations/failures/StaticFields.java Thu Aug 8 17:33:33 2013 @@ -5,9 +5,12 @@ * @author Mahmood Ali * @compile/fail/ref=StaticFields.out -XDrawDiagnostics StaticFields.java */ +import java.lang.annotation.*; + class C { int f; int a = @A C.f; } +@Target(ElementType.TYPE_USE) @interface A { } --- old/test/tools/javac/annotations/typeAnnotations/failures/StaticFields.out Thu Aug 8 17:33:34 2013 +++ new/test/tools/javac/annotations/typeAnnotations/failures/StaticFields.out Thu Aug 8 17:33:34 2013 @@ -1,2 +1,2 @@ -StaticFields.java:10:17: compiler.err.illegal.start.of.expr +StaticFields.java:12:17: compiler.err.illegal.start.of.expr 1 error --- old/test/tools/javac/annotations/typeAnnotations/failures/StaticMethods.java Thu Aug 8 17:33:34 2013 +++ new/test/tools/javac/annotations/typeAnnotations/failures/StaticMethods.java Thu Aug 8 17:33:34 2013 @@ -5,8 +5,11 @@ * @author Mahmood Ali * @compile/fail/ref=StaticMethods.out -XDrawDiagnostics StaticMethods.java */ +import java.lang.annotation.*; + class StaticMethods { - static void main(StaticMethods this) { } + static void main(@A StaticMethods this) { } } +@Target(ElementType.TYPE_USE) @interface A { } --- old/test/tools/javac/annotations/typeAnnotations/failures/StaticMethods.out Thu Aug 8 17:33:35 2013 +++ new/test/tools/javac/annotations/typeAnnotations/failures/StaticMethods.out Thu Aug 8 17:33:35 2013 @@ -1,2 +1,2 @@ -StaticMethods.java:9:34: compiler.err.non-static.cant.be.ref: kindname.variable, this +StaticMethods.java:11:37: compiler.err.non-static.cant.be.ref: kindname.variable, this 1 error