---

marijnh · marijnh · commit a71bb332a79b · 2011-09-21T21:39:31.000+02:00
yaml --- r: 5429 b: refs/heads/master c: 80778f6 h: refs/heads/master i: 5427: 9349286 v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31c04a53e9d928b64b6923aa4aad3ffd434b400c
+refs/heads/master: 80778f642fb7f4084c6ad6efd7e9605f381e881a
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_bot(ccx.tcx, t);
+            ty::type_is_native(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

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 31c04a53e9d928b64b6923aa4aad3ffd434b400c`
	`2`	`+refs/heads/master: 80778f642fb7f4084c6ad6efd7e9605f381e881a`
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) \|\| ty::type_is_bot(ccx.tcx, t);`
	`4309`	`+ ty::type_is_native(ccx.tcx, t);`
`4310`	`4310`	`}`
`4311`	`4311`
`4312`	`4312`	`fn do_spill(cx: @block_ctxt, v: ValueRef, t: ty::t) -> result {`