--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java	Mon Sep 22 14:55:14 2014 +0200
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java	Mon Sep 22 17:09:33 2014 -0400
@@ -1797,10 +1797,9 @@
                 return new ClassType(restype.getEnclosingType(),
                               List.<Type>of(new WildcardType(types.erasure(qualifierType),
                                                                BoundKind.EXTENDS,
-                                                             syms.boundClass,
-                                                             Type.noAnnotations)),
+                                                             syms.boundClass)),
                                      restype.tsym,
-                                     restype.getAnnotationMirrors());
+                                     restype.getMetadata());
             } else {
                 return restype;
             }
@@ -1970,7 +1969,7 @@
                 ClassType site = new ClassType(clazztype.getEnclosingType(),
                             clazztype.tsym.type.getTypeArguments(),
                                                clazztype.tsym,
-                                               clazztype.getAnnotationMirrors());
+                                               clazztype.getMetadata());
 
                 Env<AttrContext> diamondEnv = localEnv.dup(tree);
                 diamondEnv.info.selectSuper = cdef != null;
@@ -2189,8 +2188,7 @@
             owntype = elemtype;
             for (List<JCExpression> l = tree.dims; l.nonEmpty(); l = l.tail) {
                 attribExpr(l.head, localEnv, syms.intType);
-                owntype = new ArrayType(owntype, syms.arrayClass,
-                                        Type.noAnnotations);
+                owntype = new ArrayType(owntype, syms.arrayClass);
             }
         } else {
             // we are seeing an untyped aggregate { ... }
@@ -2207,8 +2205,7 @@
         }
         if (tree.elems != null) {
             attribExprs(tree.elems, localEnv, elemtype);
-            owntype = new ArrayType(elemtype, syms.arrayClass,
-                                    Type.noAnnotations);
+            owntype = new ArrayType(elemtype, syms.arrayClass);
         }
         if (!types.isReifiable(elemtype))
             log.error(tree.pos(), "generic.array.creation");
@@ -3509,7 +3506,7 @@
                         if (normOuter != ownOuter)
                             owntype = new ClassType(
                                 normOuter, List.<Type>nil(), owntype.tsym,
-                                owntype.getAnnotationMirrors());
+                                owntype.getMetadata());
                     }
                 }
                 break;
@@ -3830,7 +3827,7 @@
 
     public void visitTypeArray(JCArrayTypeTree tree) {
         Type etype = attribType(tree.elemtype, env);
-        Type type = new ArrayType(etype, syms.arrayClass, Type.noAnnotations);
+        Type type = new ArrayType(etype, syms.arrayClass);
         result = check(tree, type, TYP, resultInfo);
     }
 
@@ -3879,7 +3876,7 @@
                     }
                 }
                 owntype = new ClassType(clazzOuter, actuals, clazztype.tsym,
-                                        clazztype.getAnnotationMirrors());
+                                        clazztype.getMetadata());
             } else {
                 if (formals.length() != 0) {
                     log.error(tree.pos(), "wrong.number.type.args",
@@ -4030,8 +4027,7 @@
             : attribType(tree.inner, env);
         result = check(tree, new WildcardType(chk.checkRefType(tree.pos(), type),
                                               tree.kind.kind,
-                                              syms.boundClass,
-                                              Type.noAnnotations),
+                                              syms.boundClass),
                        TYP, resultInfo);
     }