1.1 --- a/src/share/classes/com/sun/tools/javac/jvm/Gen.java Tue Jun 04 13:21:41 2013 +0100
1.2 +++ b/src/share/classes/com/sun/tools/javac/jvm/Gen.java Tue Jun 04 14:17:50 2013 -0700
1.3 @@ -518,7 +518,7 @@
1.4 // Insert any instance initializers into all constructors.
1.5 if (initCode.length() != 0) {
1.6 List<JCStatement> inits = initCode.toList();
1.7 - initTAs.addAll(c.annotations.getInitTypeAttributes());
1.8 + initTAs.addAll(c.getInitTypeAttributes());
1.9 List<Attribute.TypeCompound> initTAlist = initTAs.toList();
1.10 for (JCTree t : methodDefs) {
1.11 normalizeMethod((JCMethodDecl)t, inits, initTAlist);
1.12 @@ -541,9 +541,9 @@
1.13 methodDefs.append(make.MethodDef(clinit, block));
1.14
1.15 if (!clinitTAs.isEmpty())
1.16 - clinit.annotations.appendUniqueTypes(clinitTAs.toList());
1.17 - if (!c.annotations.getClassInitTypeAttributes().isEmpty())
1.18 - clinit.annotations.appendUniqueTypes(c.annotations.getClassInitTypeAttributes());
1.19 + clinit.appendUniqueTypeAttributes(clinitTAs.toList());
1.20 + if (!c.getClassInitTypeAttributes().isEmpty())
1.21 + clinit.appendUniqueTypeAttributes(c.getClassInitTypeAttributes());
1.22 }
1.23 // Return all method definitions.
1.24 return methodDefs.toList();
1.25 @@ -560,7 +560,7 @@
1.26 nonfieldTAs.add(ta);
1.27 }
1.28 }
1.29 - sym.annotations.setTypeAttributes(fieldTAs.toList());
1.30 + sym.setTypeAttributes(fieldTAs.toList());
1.31 return nonfieldTAs.toList();
1.32 }
1.33
1.34 @@ -618,7 +618,7 @@
1.35 if (md.body.endpos == Position.NOPOS)
1.36 md.body.endpos = TreeInfo.endPos(md.body.stats.last());
1.37
1.38 - md.sym.annotations.appendUniqueTypes(initTAs);
1.39 + md.sym.appendUniqueTypeAttributes(initTAs);
1.40 }
1.41 }
1.42
