--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/DeferredAttr.java	Fri Apr 03 16:35:58 2015 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/DeferredAttr.java	Tue Apr 07 11:04:29 2015 -0700
@@ -176,14 +176,14 @@
         SpeculativeCache speculativeCache;
 
         DeferredType(JCExpression tree, Env<AttrContext> env) {
-            super(null, TypeMetadata.empty);
+            super(null, TypeMetadata.EMPTY);
             this.tree = tree;
             this.env = attr.copyEnv(env);
             this.speculativeCache = new SpeculativeCache();
         }
 
         @Override
-        public DeferredType clone(TypeMetadata md) {
+        public DeferredType cloneWithMetadata(TypeMetadata md) {
             throw new AssertionError("Cannot add metadata to a deferred type");
         }