Skip to content

Commit 2458673

Browse files
committed
---
yaml --- r: 5425 b: refs/heads/master c: fcd1773 h: refs/heads/master i: 5423: c26dfb7 v: v3
1 parent 7e47a0f commit 2458673

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: a034f87146e60e1db2327c6f6807c47406a1bb0b
2+
refs/heads/master: fcd17731cf7e27bcc7abb24b0aefb9d3dce15ed3

trunk/src/comp/middle/trans.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4312,6 +4312,11 @@ fn type_is_immediate(ccx: @crate_ctxt, t: ty::t) -> bool {
43124312
fn do_spill(cx: @block_ctxt, v: ValueRef, t: ty::t) -> result {
43134313
// We have a value but we have to spill it, and root it, to pass by alias.
43144314
let bcx = cx;
4315+
4316+
if ty::type_is_bot(bcx_tcx(bcx), t) {
4317+
ret rslt(bcx, C_null(T_ptr(T_i8())));
4318+
}
4319+
43154320
let r = alloc_ty(bcx, t);
43164321
bcx = r.bcx;
43174322
let llptr = r.val;

0 commit comments

Comments
 (0)