user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make 'fail fail;' compile.

Browse source 
Closes #972
This commit is contained in:
Marijn Haverbeke 2011-09-26 03:57:08 +02:00
parent 6164b72402
commit 4c5e42a139
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/comp/middle/trans.rs
View file

@ -438,11 +438,13 @@ fn align_of(cx: @block_ctxt, t: ty::t) -> result {
}
fn alloca(cx: @block_ctxt, t: TypeRef) -> ValueRef {
if cx.unreachable { ret llvm::LLVMGetUndef(t); }
ret Alloca(new_raw_block_ctxt(cx.fcx, cx.fcx.llstaticallocas), t);
}
fn dynastack_alloca(cx: @block_ctxt, t: TypeRef, n: ValueRef, ty: ty::t) ->
ValueRef {
if cx.unreachable { ret llvm::LLVMGetUndef(t); }
let bcx = cx;
let dy_cx = new_raw_block_ctxt(cx.fcx, cx.fcx.lldynamicallocas);
let lltaskptr = bcx_fcx(bcx).lltaskptr;
@ -4474,6 +4476,8 @@ fn trans_fail_expr(cx: @block_ctxt, sp_opt: option::t<span>,
ty::mk_mach(tcx,
ast::ty_u8)));
ret trans_fail_value(bcx, sp_opt, data);
} else if bcx.unreachable {
ret rslt(bcx, C_nil());
} else {
bcx_ccx(cx).sess.span_bug(expr.span,
"fail called with unsupported type " +