---

pcwalton · pcwalton · commit b8c193ca197c · 2011-09-21T10:55:28.000-07:00
yaml --- r: 5426 b: refs/heads/master c: f19ab1f h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcd17731cf7e27bcc7abb24b0aefb9d3dce15ed3
+refs/heads/master: f19ab1ff3c85973a54cc98e3f98ae240e2d0d816
diff --git a/trunk/src/comp/middle/trans.rs b/trunk/src/comp/middle/trans.rs
@@ -4306,7 +4306,7 @@ fn with_out_method(work: fn(out_method) -> result, cx: @block_ctxt,
 // immediate-ness of the type.
 fn type_is_immediate(ccx: @crate_ctxt, t: ty::t) -> bool {
     ret ty::type_is_scalar(ccx.tcx, t) || ty::type_is_boxed(ccx.tcx, t) ||
-            ty::type_is_native(ccx.tcx, t);
+            ty::type_is_native(ccx.tcx, t) || ty::type_is_bot(ccx.tcx, t);
 }
 
 fn do_spill(cx: @block_ctxt, v: ValueRef, t: ty::t) -> result {
diff --git a/trunk/src/test/run-pass/log-ret.rs b/trunk/src/test/run-pass/log-ret.rs
@@ -0,0 +1,5 @@
+// xfail-test
+
+fn f() { log ret; }
+fn main() { f(); }
+

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: fcd17731cf7e27bcc7abb24b0aefb9d3dce15ed3`
	`2`	`+refs/heads/master: f19ab1ff3c85973a54cc98e3f98ae240e2d0d816`
Original file line number	Diff line number	Diff line change
`@@ -4306,7 +4306,7 @@ fn with_out_method(work: fn(out_method) -> result, cx: @block_ctxt,`
`4306`	`4306`	`// immediate-ness of the type.`
`4307`	`4307`	`fn type_is_immediate(ccx: @crate_ctxt, t: ty::t) -> bool {`
`4308`	`4308`	`ret ty::type_is_scalar(ccx.tcx, t) \|\| ty::type_is_boxed(ccx.tcx, t) \|\|`
`4309`		`- ty::type_is_native(ccx.tcx, t);`
	`4309`	`+ ty::type_is_native(ccx.tcx, t) \|\| ty::type_is_bot(ccx.tcx, t);`
`4310`	`4310`	`}`
`4311`	`4311`
`4312`	`4312`	`fn do_spill(cx: @block_ctxt, v: ValueRef, t: ty::t) -> result {`