Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Check.java	Wed Jan 20 16:12:26 2010 -0800
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Check.java	Tue Jan 26 11:15:49 2010 -0800
     1.3 @@ -2047,7 +2047,7 @@
     1.4              Symbol m = TreeInfo.symbol(assign.lhs);
     1.5              if (m == null || m.type.isErroneous()) continue;
     1.6              if (!members.remove(m))
     1.7 -                log.error(arg.pos(), "duplicate.annotation.member.value",
     1.8 +                log.error(assign.lhs.pos(), "duplicate.annotation.member.value",
     1.9                            m.name, a.type);
    1.10              if (assign.rhs.getTag() == ANNOTATION)
    1.11                  validateAnnotation((JCAnnotation)assign.rhs);

     2.1 --- a/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateAnnotationValue.java	Wed Jan 20 16:12:26 2010 -0800
     2.2 +++ b/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateAnnotationValue.java	Tue Jan 26 11:15:49 2010 -0800
     2.3 @@ -1,6 +1,6 @@
     2.4  /*
     2.5   * @test /nodynamiccopyright/
     2.6 - * @bug 6843077
     2.7 + * @bug 6843077 6919944
     2.8   * @summary check for duplicate annotation values
     2.9   * @author Mahmood Ali
    2.10   * @compile/fail/ref=DuplicateAnnotationValue.out -XDrawDiagnostics -source 1.7 DuplicateAnnotationValue.java

     3.1 --- a/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateAnnotationValue.out	Wed Jan 20 16:12:26 2010 -0800
     3.2 +++ b/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateAnnotationValue.out	Tue Jan 26 11:15:49 2010 -0800
     3.3 @@ -1,2 +1,2 @@
     3.4 -DuplicateAnnotationValue.java:10:45: compiler.err.duplicate.annotation.member.value: value, A
     3.5 +DuplicateAnnotationValue.java:10:37: compiler.err.duplicate.annotation.member.value: value, A
     3.6  1 error

     4.1 --- a/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.java	Wed Jan 20 16:12:26 2010 -0800
     4.2 +++ b/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.java	Tue Jan 26 11:15:49 2010 -0800
     4.3 @@ -1,6 +1,6 @@
     4.4  /*
     4.5   * @test /nodynamiccopyright/
     4.6 - * @bug 6843077
     4.7 + * @bug 6843077 6919944
     4.8   * @summary check for duplicate annotation values
     4.9   * @author Mahmood Ali
    4.10   * @compile/fail/ref=DuplicateAnnotationValue.out -XDrawDiagnostics -source 1.7 DuplicateAnnotationValue.java

     5.1 --- a/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.out	Wed Jan 20 16:12:26 2010 -0800
     5.2 +++ b/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.out	Tue Jan 26 11:15:49 2010 -0800
     5.3 @@ -1,2 +1,2 @@
     5.4 -DuplicateAnnotationValue.java:10:34: compiler.err.duplicate.annotation.member.value: value, A
     5.5 +DuplicateAnnotationValue.java:10:26: compiler.err.duplicate.annotation.member.value: value, A
     5.6  1 error

     6.1 --- a/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.java	Wed Jan 20 16:12:26 2010 -0800
     6.2 +++ b/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.java	Tue Jan 26 11:15:49 2010 -0800
     6.3 @@ -1,6 +1,6 @@
     6.4  /*
     6.5   * @test /nodynamiccopyright/
     6.6 - * @bug 6843077
     6.7 + * @bug 6843077 6919944
     6.8   * @summary check for duplicate annotation values for type parameter
     6.9   * @author Mahmood Ali
    6.10   * @compile/fail/ref=DuplicateAnnotationValue.out -XDrawDiagnostics -source 1.7 DuplicateAnnotationValue.java

     7.1 --- a/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.out	Wed Jan 20 16:12:26 2010 -0800
     7.2 +++ b/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.out	Tue Jan 26 11:15:49 2010 -0800
     7.3 @@ -1,2 +1,2 @@
     7.4 -DuplicateAnnotationValue.java:10:39: compiler.err.duplicate.annotation.member.value: value, A
     7.5 +DuplicateAnnotationValue.java:10:31: compiler.err.duplicate.annotation.member.value: value, A
     7.6  1 error

     8.1 --- a/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.java	Wed Jan 20 16:12:26 2010 -0800
     8.2 +++ b/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.java	Tue Jan 26 11:15:49 2010 -0800
     8.3 @@ -1,6 +1,6 @@
     8.4  /*
     8.5   * @test /nodynamiccopyright/
     8.6 - * @bug 6843077
     8.7 + * @bug 6843077 6919944
     8.8   * @summary check for duplicate annotation values
     8.9   * @author Mahmood Ali
    8.10   * @compile/fail/ref=DuplicateAnnotationValue.out -XDrawDiagnostics -source 1.7 DuplicateAnnotationValue.java

     9.1 --- a/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.out	Wed Jan 20 16:12:26 2010 -0800
     9.2 +++ b/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.out	Tue Jan 26 11:15:49 2010 -0800
     9.3 @@ -1,2 +1,2 @@
     9.4 -DuplicateAnnotationValue.java:10:51: compiler.err.duplicate.annotation.member.value: value, A
     9.5 +DuplicateAnnotationValue.java:10:43: compiler.err.duplicate.annotation.member.value: value, A
     9.6  1 error

    10.1 --- a/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.java	Wed Jan 20 16:12:26 2010 -0800
    10.2 +++ b/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.java	Tue Jan 26 11:15:49 2010 -0800
    10.3 @@ -1,6 +1,6 @@
    10.4  /*
    10.5   * @test /nodynamiccopyright/
    10.6 - * @bug 6843077
    10.7 + * @bug 6843077 6919944
    10.8   * @summary check for duplicate annotation values for type parameter
    10.9   * @author Mahmood Ali
   10.10   * @compile/fail/ref=DuplicateAnnotationValue.out -XDrawDiagnostics -source 1.7 DuplicateAnnotationValue.java

    11.1 --- a/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.out	Wed Jan 20 16:12:26 2010 -0800
    11.2 +++ b/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.out	Tue Jan 26 11:15:49 2010 -0800
    11.3 @@ -1,2 +1,2 @@
    11.4 -DuplicateAnnotationValue.java:8:64: compiler.err.duplicate.annotation.member.value: value, A
    11.5 +DuplicateAnnotationValue.java:8:56: compiler.err.duplicate.annotation.member.value: value, A
    11.6  1 error

    12.1 --- a/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.java	Wed Jan 20 16:12:26 2010 -0800
    12.2 +++ b/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.java	Tue Jan 26 11:15:49 2010 -0800
    12.3 @@ -1,6 +1,6 @@
    12.4  /*
    12.5   * @test /nodynamiccopyright/
    12.6 - * @bug 6843077
    12.7 + * @bug 6843077 6919944
    12.8   * @summary check for duplicate annotation values in receiver
    12.9   * @author Mahmood Ali
   12.10   * @compile/fail/ref=DuplicateAnnotationValue.out -XDrawDiagnostics -source 1.7 DuplicateAnnotationValue.java

    13.1 --- a/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.out	Wed Jan 20 16:12:26 2010 -0800
    13.2 +++ b/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.out	Tue Jan 26 11:15:49 2010 -0800
    13.3 @@ -1,2 +1,2 @@
    13.4 -DuplicateAnnotationValue.java:9:37: compiler.err.duplicate.annotation.member.value: value, A
    13.5 +DuplicateAnnotationValue.java:9:29: compiler.err.duplicate.annotation.member.value: value, A
    13.6  1 error

    14.1 --- a/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.java	Wed Jan 20 16:12:26 2010 -0800
    14.2 +++ b/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.java	Tue Jan 26 11:15:49 2010 -0800
    14.3 @@ -1,6 +1,6 @@
    14.4  /*
    14.5   * @test /nodynamiccopyright/
    14.6 - * @bug 6843077
    14.7 + * @bug 6843077 6919944
    14.8   * @summary check for duplicate annotation values for type parameter
    14.9   * @author Mahmood Ali
   14.10   * @compile/fail/ref=DuplicateAnnotationValue.out -XDrawDiagnostics -source 1.7 DuplicateAnnotationValue.java

    15.1 --- a/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.out	Wed Jan 20 16:12:26 2010 -0800
    15.2 +++ b/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.out	Tue Jan 26 11:15:49 2010 -0800
    15.3 @@ -1,2 +1,2 @@
    15.4 -DuplicateAnnotationValue.java:9:50: compiler.err.duplicate.annotation.member.value: value, A
    15.5 +DuplicateAnnotationValue.java:9:42: compiler.err.duplicate.annotation.member.value: value, A
    15.6  1 error

    16.1 --- a/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.java	Wed Jan 20 16:12:26 2010 -0800
    16.2 +++ b/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.java	Tue Jan 26 11:15:49 2010 -0800
    16.3 @@ -1,6 +1,6 @@
    16.4  /*
    16.5   * @test /nodynamiccopyright/
    16.6 - * @bug 6843077
    16.7 + * @bug 6843077 6919944
    16.8   * @summary check for duplicate annotation values for type parameter
    16.9   * @author Mahmood Ali
   16.10   * @compile/fail/ref=DuplicateAnnotationValue.out -XDrawDiagnostics -source 1.7 DuplicateAnnotationValue.java

    17.1 --- a/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.out	Wed Jan 20 16:12:26 2010 -0800
    17.2 +++ b/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.out	Tue Jan 26 11:15:49 2010 -0800
    17.3 @@ -1,2 +1,2 @@
    17.4 -DuplicateAnnotationValue.java:8:54: compiler.err.duplicate.annotation.member.value: value, A
    17.5 +DuplicateAnnotationValue.java:8:46: compiler.err.duplicate.annotation.member.value: value, A
    17.6  1 error

    18.1 --- a/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.java	Wed Jan 20 16:12:26 2010 -0800
    18.2 +++ b/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.java	Tue Jan 26 11:15:49 2010 -0800
    18.3 @@ -1,6 +1,6 @@
    18.4  /*
    18.5   * @test /nodynamiccopyright/
    18.6 - * @bug 6843077
    18.7 + * @bug 6843077 6919944
    18.8   * @summary check for duplicate annotation values for type parameter
    18.9   * @author Mahmood Ali
   18.10   * @compile/fail/ref=DuplicateAnnotationValue.out -XDrawDiagnostics -source 1.7 DuplicateAnnotationValue.java

    19.1 --- a/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.out	Wed Jan 20 16:12:26 2010 -0800
    19.2 +++ b/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.out	Tue Jan 26 11:15:49 2010 -0800
    19.3 @@ -1,2 +1,2 @@
    19.4 -DuplicateAnnotationValue.java:9:50: compiler.err.duplicate.annotation.member.value: value, A
    19.5 +DuplicateAnnotationValue.java:9:42: compiler.err.duplicate.annotation.member.value: value, A
    19.6  1 error