---

yaml
---
r: 11414
b: refs/heads/master
c: 8015e6d
h: refs/heads/master
v: v3

Author: marijnh

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: ffd50b9cdfa38bc80f2444d917eef5a02c38c32f
+refs/heads/master: 8015e6d52b7eeea47f9e61c6ac42487935474ca4
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/comp/middle/typeck.rs

@@ -1146,8 +1146,10 @@ mod writeback {
                                   typ) {
           fix_ok(new_type) { ret some(new_type); }
           fix_err(vid) {
-            fcx.ccx.tcx.sess.span_err(sp, "cannot determine a type \
-                                           for this expression");
+            if !fcx.ccx.tcx.sess.has_errors() {
+                fcx.ccx.tcx.sess.span_err(sp, "cannot determine a type \
+                                               for this expression");
+            }
             ret none;
           }
         }
@@ -2546,7 +2548,7 @@ fn check_expr_with_unifier(fcx: @fn_ctxt, expr: @ast::expr, unify: unifier,
                                field, ty_to_str(tcx, t_err)];
                 tcx.sess.span_err(expr.span, msg);
                 // NB: Adding a bogus type to allow typechecking to continue
-                write_ty(tcx, id, ty::mk_nil(tcx));
+                write_ty(tcx, id, next_ty_var(fcx));
               }
             }
         }