---

marijnh · marijnh · commit 8018fb534197 · 2011-09-23T11:19:15.000+02:00
yaml --- r: 5474 b: refs/heads/master c: 348cd86 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0bbde048a414bdf6dcdf7e00cc429bf8d8d2a5f0
+refs/heads/master: 348cd86d87521ba6ee74c3f06d13fcccf6b8a7f3
diff --git a/trunk/src/comp/middle/typeck.rs b/trunk/src/comp/middle/typeck.rs
@@ -1920,7 +1920,8 @@ fn check_expr_with_unifier(fcx: @fn_ctxt, expr: @ast::expr, unify: unifier,
         write::ty_only_fixup(fcx, id, ty::mk_nil(tcx));
       }
       ast::expr_do_while(body, cond) {
-        bot = check_expr(fcx, cond) | check_block(fcx, body);
+        bot = check_expr_with(fcx, cond, ty::mk_bool(tcx)) |
+              check_block(fcx, body);
         write::ty_only_fixup(fcx, id, block_ty(tcx, body));
       }
       ast::expr_alt(expr, arms) {

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 0bbde048a414bdf6dcdf7e00cc429bf8d8d2a5f0`
	`2`	`+refs/heads/master: 348cd86d87521ba6ee74c3f06d13fcccf6b8a7f3`
Original file line number	Diff line number	Diff line change
`@@ -1920,7 +1920,8 @@ fn check_expr_with_unifier(fcx: @fn_ctxt, expr: @ast::expr, unify: unifier,`
`1920`	`1920`	`write::ty_only_fixup(fcx, id, ty::mk_nil(tcx));`
`1921`	`1921`	`}`
`1922`	`1922`	`ast::expr_do_while(body, cond) {`
`1923`		`- bot = check_expr(fcx, cond) \| check_block(fcx, body);`
	`1923`	`+ bot = check_expr_with(fcx, cond, ty::mk_bool(tcx)) \|`
	`1924`	`+ check_block(fcx, body);`
`1924`	`1925`	`write::ty_only_fixup(fcx, id, block_ty(tcx, body));`
`1925`	`1926`	`}`
`1926`	`1927`	`ast::expr_alt(expr, arms) {`