changeset 2193:2a26f48513a9

Merge
author jjg
date Tue, 12 Feb 2013 17:21:02 -0800
parents 9e41050bcedc bc456436c613
children cf9bf24b5b84
files src/share/classes/com/sun/tools/classfile/ClassWriter.java src/share/classes/com/sun/tools/classfile/TypeAnnotation.java src/share/classes/com/sun/tools/javac/code/TargetType.java src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java src/share/classes/com/sun/tools/javac/code/Types.java src/share/classes/com/sun/tools/javac/comp/Attr.java src/share/classes/com/sun/tools/javac/jvm/ClassReader.java src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java src/share/classes/com/sun/tools/javac/parser/JavacParser.java src/share/classes/com/sun/tools/javac/tree/TreeInfo.java src/share/classes/com/sun/tools/javap/AnnotationWriter.java test/tools/javac/annotations/typeAnnotations/failures/LazyConstantValue.java test/tools/javac/annotations/typeAnnotations/failures/TypeVariable.java test/tools/javac/annotations/typeAnnotations/failures/VoidGenericMethod.java test/tools/javac/annotations/typeAnnotations/newlocations/Lambda.java test/tools/javac/annotations/typeAnnotations/referenceinfos/Lambda.java test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodParameters.java test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeCasts.java
diffstat 4 files changed, 11 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/test/tools/javac/annotations/typeAnnotations/failures/LazyConstantValue.java	Tue Feb 12 15:48:45 2013 -0800
+++ b/test/tools/javac/annotations/typeAnnotations/failures/LazyConstantValue.java	Tue Feb 12 17:21:02 2013 -0800
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 1234567
+ * @bug 8008077
  * @summary Type annotations in a lazy constant need to be attributed
  *   in the correct order.
  * @author Werner Dietl
--- a/test/tools/javac/annotations/typeAnnotations/failures/TypeVariable.java	Tue Feb 12 15:48:45 2013 -0800
+++ b/test/tools/javac/annotations/typeAnnotations/failures/TypeVariable.java	Tue Feb 12 17:21:02 2013 -0800
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 1234567
+ * @bug 8008077
  * @summary Type annotations on a type variable, where the bound of
  *   the type variable is also annotated, need to be processed correctly.
  * @author Werner Dietl
--- a/test/tools/javac/annotations/typeAnnotations/newlocations/Lambda.java	Tue Feb 12 15:48:45 2013 -0800
+++ b/test/tools/javac/annotations/typeAnnotations/newlocations/Lambda.java	Tue Feb 12 17:21:02 2013 -0800
@@ -21,14 +21,16 @@
  * questions.
  */
 
-import java.lang.annotation.*;
-
 /*
  * @test
+ * @bug 8008077
  * @summary new type annotation location: lambda expressions
  * @compile Lambda.java
  * @author Werner Dietl
  */
+
+import java.lang.annotation.*;
+
 public class Lambda {
 
     interface LambdaInt {
@@ -54,4 +56,4 @@
 @interface TA { }
 
 @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@interface TB { }
\ No newline at end of file
+@interface TB { }
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/Lambda.java	Tue Feb 12 15:48:45 2013 -0800
+++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/Lambda.java	Tue Feb 12 17:21:02 2013 -0800
@@ -21,15 +21,17 @@
  * questions.
  */
 
-import static com.sun.tools.classfile.TypeAnnotation.TargetType.*;
-
 /*
  * @test
+ * @bug 8008077
  * @summary Test population of reference info for lambda expressions
  * @compile -g Driver.java ReferenceInfoUtil.java Lambda.java
  * @run main Driver Lambda
  * @author Werner Dietl
  */
+
+import static com.sun.tools.classfile.TypeAnnotation.TargetType.*;
+
 public class Lambda {
 
     @TADescriptions({