OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Work around an apparent compiler bug to make my patch run

Browse Source 
Without this, it would fail when optimization is turned on. The result of
the Load(bcx, llclosure) call would end up in llenv in a corrupted form.
This commit is contained in:
Marijn Haverbeke 2011-09-16 21:28:47 +02:00
parent 575aae407b
commit 43b219dbec
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/comp/middle/trans.rs
View File

@ -3709,9 +3709,10 @@ fn trans_call(in_cx: @block_ctxt, f: @ast::expr,
let bcx = f_res.bcx;
let faddr = f_res.val;
let llenv = alt f_res.env {
null_env. { C_null(T_opaque_closure_ptr(*bcx_ccx(cx))) }
some_env(e) { e }
let llenv;
alt f_res.env {
null_env. { llenv = C_null(T_opaque_closure_ptr(*bcx_ccx(cx))); }
some_env(e) { llenv = e; }
is_closure. {
// It's a closure. Have to fetch the elements
if f_res.is_mem { faddr = load_if_immediate(bcx, faddr, fn_expr_ty); }
@ -3719,9 +3720,9 @@ fn trans_call(in_cx: @block_ctxt, f: @ast::expr,
faddr = GEP(bcx, pair, [C_int(0), C_int(abi::fn_field_code)]);
faddr = Load(bcx, faddr);
let llclosure = GEP(bcx, pair, [C_int(0), C_int(abi::fn_field_box)]);
Load(bcx, llclosure)
llenv = Load(bcx, llclosure);
}
};
}
let ret_ty = ty::node_id_to_type(bcx_tcx(cx), id);
let args_res =