1.1 --- a/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Wed Dec 19 11:29:56 2012 +0000
1.2 +++ b/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Sun Dec 16 11:09:36 2012 +0100
1.3 @@ -721,7 +721,7 @@
1.4 endAttr(alenIdx);
1.5 acount++;
1.6 }
1.7 - acount += writeJavaAnnotations(sym.getAnnotationMirrors());
1.8 + acount += writeJavaAnnotations(sym.getRawAttributes());
1.9 return acount;
1.10 }
1.11
1.12 @@ -732,7 +732,7 @@
1.13 boolean hasVisible = false;
1.14 boolean hasInvisible = false;
1.15 if (m.params != null) for (VarSymbol s : m.params) {
1.16 - for (Attribute.Compound a : s.getAnnotationMirrors()) {
1.17 + for (Attribute.Compound a : s.getRawAttributes()) {
1.18 switch (types.getRetention(a)) {
1.19 case SOURCE: break;
1.20 case CLASS: hasInvisible = true; break;
1.21 @@ -748,7 +748,7 @@
1.22 databuf.appendByte(m.params.length());
1.23 for (VarSymbol s : m.params) {
1.24 ListBuffer<Attribute.Compound> buf = new ListBuffer<Attribute.Compound>();
1.25 - for (Attribute.Compound a : s.getAnnotationMirrors())
1.26 + for (Attribute.Compound a : s.getRawAttributes())
1.27 if (types.getRetention(a) == RetentionPolicy.RUNTIME)
1.28 buf.append(a);
1.29 databuf.appendChar(buf.length());
1.30 @@ -763,7 +763,7 @@
1.31 databuf.appendByte(m.params.length());
1.32 for (VarSymbol s : m.params) {
1.33 ListBuffer<Attribute.Compound> buf = new ListBuffer<Attribute.Compound>();
1.34 - for (Attribute.Compound a : s.getAnnotationMirrors())
1.35 + for (Attribute.Compound a : s.getRawAttributes())
1.36 if (types.getRetention(a) == RetentionPolicy.CLASS)
1.37 buf.append(a);
1.38 databuf.appendChar(buf.length());
1.39 @@ -1636,7 +1636,7 @@
1.40 }
1.41
1.42 acount += writeFlagAttrs(c.flags());
1.43 - acount += writeJavaAnnotations(c.getAnnotationMirrors());
1.44 + acount += writeJavaAnnotations(c.getRawAttributes());
1.45 acount += writeEnclosingMethodAttribute(c);
1.46 acount += writeExtraClassAttributes(c);
1.47
