auto merge of #10107 : thestinger/rust/immediate, r=huonw

bors · bors · commit 560d9999bc79 · 2013-10-28T08:36:33.000-07:00
diff --git a/src/librustc/middle/trans/common.rs b/src/librustc/middle/trans/common.rs
@@ -70,6 +70,7 @@ pub fn type_is_immediate(ccx: &mut CrateContext, ty: ty::t) -> bool {
         return true;
     }
     match ty::get(ty).sty {
+        ty::ty_bot => true,
         ty::ty_struct(*) | ty::ty_enum(*) | ty::ty_tup(*) => {
             let llty = sizing_type_of(ccx, ty);
             llsize_of_alloc(ccx, llty) <= llsize_of_alloc(ccx, ccx.int_type)

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ pub fn type_is_immediate(ccx: &mut CrateContext, ty: ty::t) -> bool {`
`70`	`70`	`return true;`
`71`	`71`	`}`
`72`	`72`	`match ty::get(ty).sty {`
	`73`	`+ ty::ty_bot => true,`
`73`	`74`	`ty::ty_struct() \| ty::ty_enum() \| ty::ty_tup(*) => {`
`74`	`75`	`let llty = sizing_type_of(ccx, ty);`
`75`	`76`	`llsize_of_alloc(ccx, llty) <= llsize_of_alloc(ccx, ccx.int_type)`