changeset 2201:cf9bf24b5b84

Automated merge with http://hg.openjdk.java.net/jdk8/tl/langtools
author wmdietl
date Wed, 13 Feb 2013 14:06:02 -0800
parents 3f9875aa5d67 2a26f48513a9
children 45651f09a242
files .hgtags src/share/classes/com/sun/tools/javac/code/Flags.java src/share/classes/com/sun/tools/javac/code/Symbol.java src/share/classes/com/sun/tools/javac/comp/Lower.java src/share/classes/com/sun/tools/javac/comp/MemberEnter.java src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java src/share/classes/com/sun/tools/javap/AttributeWriter.java
diffstat 6 files changed, 1 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Feb 13 11:25:58 2013 -0800
+++ b/.hgtags	Wed Feb 13 14:06:02 2013 -0800
@@ -140,6 +140,7 @@
 1cbe86c11ba69521875c0b0357d7540781eb334d jdk8-b17
 ec2c0973cc31e143cffc05ceb63d98fae76f97d4 jdk8-b16
 ab1b1cc7857716914f2bb20b3128e5a8978290f7 jdk8-b18
+2a2d6ac056cfde7326f309ab73b8cddf518cc729 308-jdk8-sync
 77b2c066084cbc75150efc6603a713c558329813 jdk8-b19
 ffd294128a48cbb90ce8f0569f82b61f1f164a18 jdk8-b20
 bcb21abf1c4177baf4574f99709513dcd4474727 jdk8-b21
--- a/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java	Wed Feb 13 11:25:58 2013 -0800
+++ b/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java	Wed Feb 13 14:06:02 2013 -0800
@@ -24,7 +24,6 @@
 /*
  * @test
  * @bug 8006735
- * @ignore
  * @summary  Smoke test for ensuring that annotations are emited to javadoc
  *
  * @author   Mahmood Ali <mali>
--- a/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest1.java	Wed Feb 13 11:25:58 2013 -0800
+++ b/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest1.java	Wed Feb 13 14:06:02 2013 -0800
@@ -24,7 +24,6 @@
 /*
  * @test
  * @bug 8005085 8005877 8004829 8005681 8006734 8006775
- * @ignore
  * @summary Combinations of Target ElementTypes on (repeated)type annotations.
  */
 
--- a/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest2.java	Wed Feb 13 11:25:58 2013 -0800
+++ b/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest2.java	Wed Feb 13 14:06:02 2013 -0800
@@ -24,7 +24,6 @@
 /*
  * @test
  * @bug 8005085 8005877 8004829 8005681 8006734 8006775
- * @ignore
  * @summary Combinations of Target ElementTypes on (repeated)type annotations.
  */
 
--- a/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass.java	Wed Feb 13 11:25:58 2013 -0800
+++ b/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass.java	Wed Feb 13 14:06:02 2013 -0800
@@ -1,7 +1,6 @@
 /*
  * @test /nodynamiccopyright/
  * @bug 8006733 8006775
- * @ignore
  * @summary A static outer class cannot be annotated.
  * @author Werner Dietl
  * @compile/fail/ref=CantAnnotateStaticClass.out -XDrawDiagnostics CantAnnotateStaticClass.java
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/MultiCatch.java	Wed Feb 13 11:25:58 2013 -0800
+++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/MultiCatch.java	Wed Feb 13 14:06:02 2013 -0800
@@ -26,7 +26,6 @@
 /*
  * @test
  * @bug 8006732 8006775
- * @ignore
  * @summary Test population of reference info for multicatch exception parameters
  * @author Werner Dietl
  * @compile -g Driver.java ReferenceInfoUtil.java MultiCatch.java