---

graydon · graydon · commit f5c58cbd7955 · 2011-01-21T08:25:13.000-08:00
yaml --- r: 1277 b: refs/heads/master c: 51542b2 h: refs/heads/master i: 1275: e0442f7 v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6daec4004a8bcd57701690e8a704dde6102bf10e
+refs/heads/master: 51542b279fcae0f740a76b631ce0fbcdf4c7cf5e
diff --git a/trunk/src/Makefile b/trunk/src/Makefile
@@ -456,6 +456,7 @@ TEST_XFAILS_RUSTC := $(filter-out \
                         large-records.rs \
                         lazy-init.rs \
                         lazy-and-or.rs \
+                        linear-for-loop.rs \
                         multiline-comment.rs \
                         obj-drop.rs \
                         obj-recursion.rs \
diff --git a/trunk/src/comp/middle/trans.rs b/trunk/src/comp/middle/trans.rs
@@ -1808,7 +1808,7 @@ fn trans_for(@block_ctxt cx,
         cx.build.Br(scope_cx.llbb);
         auto local_res = alloc_local(scope_cx, local);
         auto bcx = copy_ty(local_res.bcx, true, local_res.val, curr, t).bcx;
-        trans_block(bcx, body);
+        bcx = trans_block(bcx, body).bcx;
         bcx.build.Br(next_cx.llbb);
         ret res(next_cx, C_nil());
     }

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 6daec4004a8bcd57701690e8a704dde6102bf10e`
	`2`	`+refs/heads/master: 51542b279fcae0f740a76b631ce0fbcdf4c7cf5e`
Original file line number	Diff line number	Diff line change
`@@ -1808,7 +1808,7 @@ fn trans_for(@block_ctxt cx,`
`1808`	`1808`	`cx.build.Br(scope_cx.llbb);`
`1809`	`1809`	`auto local_res = alloc_local(scope_cx, local);`
`1810`	`1810`	`auto bcx = copy_ty(local_res.bcx, true, local_res.val, curr, t).bcx;`
`1811`		`- trans_block(bcx, body);`
	`1811`	`+ bcx = trans_block(bcx, body).bcx;`
`1812`	`1812`	`bcx.build.Br(next_cx.llbb);`
`1813`	`1813`	`ret res(next_cx, C_nil());`
`1814`	`1814`	`}`