squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

rustc: Ignore the return value of native functions that return nil. stage1 can build libstd now, though it leaks.

Browse source
This commit is contained in:
Patrick Walton 2011-04-26 18:48:34 -07:00
parent 532a65485d
commit 05587ebdff
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6557,6 +6557,11 @@ fn decl_native_fn_and_pair(@crate_ctxt ccx,
ty.ty_fn_args(ccx.tcx, fn_type),
ty.ty_fn_ret(ccx.tcx, fn_type), num_ty_param);
// FIXME: If the returned type is not nil, then we assume it's 32 bits
// wide. This is obviously wildly unsafe. We should have a better FFI
// that allows types of different sizes to be returned.
auto rty_is_nil = ty.type_is_nil(ccx.tcx, ty.ty_fn_ret(ccx.tcx, fn_type));
let vec[ValueRef] call_args = vec();
auto arg_n = 3u;
auto pass_task;
@ -6635,7 +6640,11 @@ fn decl_native_fn_and_pair(@crate_ctxt ccx,
rptr = bcx.build.BitCast(fcx.llretptr, T_ptr(T_i32()));
}
bcx.build.Store(r, rptr);
// We don't store the return value if it's nil, to avoid stomping on a nil
// pointer. This is the only concession made to non-i32 return values. See
// the FIXME above.
if (!rty_is_nil) { bcx.build.Store(r, rptr); }
bcx.build.RetVoid();
// Tie up the llallocas -> lltop edge.