---

catamorphism · catamorphism · commit ae488749be2e · 2011-08-04T16:07:26.000-07:00
yaml --- r: 4411 b: refs/heads/master c: e0985c1 h: refs/heads/master i: 4409: cc8b84b 4407: 149e77b v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f03ca48d8348197b52697f54a34e471b0edd79f
+refs/heads/master: e0985c10606d0b38be66734bf1a34bad70eec064
diff --git a/trunk/src/comp/middle/trans_alt.rs b/trunk/src/comp/middle/trans_alt.rs
@@ -433,7 +433,7 @@ fn trans_alt(cx: &@block_ctxt, expr: &@ast::expr, arms: &ast::arm[],
             ret rslt(cx, cx.build.Unreachable());
         }
         else {
-            ret rslt(cx, C_nil());
+            ret er;
         }
     }
 
diff --git a/trunk/src/test/run-pass/alt-bot-2.rs b/trunk/src/test/run-pass/alt-bot-2.rs
@@ -0,0 +1,3 @@
+// n.b. This was only ever failing with optimization disabled.
+fn a() -> int { alt ret 1 { 2 { 3 } } }
+fn main() { a(); }

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 5f03ca48d8348197b52697f54a34e471b0edd79f`
	`2`	`+refs/heads/master: e0985c10606d0b38be66734bf1a34bad70eec064`
Original file line number	Diff line number	Diff line change
`@@ -433,7 +433,7 @@ fn trans_alt(cx: &@block_ctxt, expr: &@ast::expr, arms: &ast::arm[],`
`433`	`433`	`ret rslt(cx, cx.build.Unreachable());`
`434`	`434`	`}`
`435`	`435`	`else {`
`436`		`- ret rslt(cx, C_nil());`
	`436`	`+ ret er;`
`437`	`437`	`}`
`438`	`438`	`}`
`439`	`439`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+// n.b. This was only ever failing with optimization disabled.`
	`2`	`+fn a() -> int { alt ret 1 { 2 { 3 } } }`
	`3`	`+fn main() { a(); }`