--- a/langtools/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java Wed Jul 17 14:11:41 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java Wed Jul 17 14:13:15 2013 +0100
@@ -127,7 +127,7 @@
DeferredType(JCExpression tree, Env<AttrContext> env) {
super(null);
this.tree = tree;
- this.env = env.dup(tree, env.info.dup());
+ this.env = attr.copyEnv(env);
this.speculativeCache = new SpeculativeCache();
}
@@ -263,7 +263,7 @@
DeferredTypeCompleter dummyCompleter = new DeferredTypeCompleter() {
public Type complete(DeferredType dt, ResultInfo resultInfo, DeferredAttrContext deferredAttrContext) {
Assert.check(deferredAttrContext.mode == AttrMode.CHECK);
- return dt.tree.type = Type.noType;
+ return dt.tree.type = Type.stuckType;
}
};