nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-05 03:38:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

A small change

Browse Source
This commit is contained in:
bjorn3 2018-08-10 19:31:02 +02:00
parent 5ebcea23e4
commit 29ab744f62
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/abi.rs
View File

@ -315,10 +315,6 @@ pub fn codegen_call<'a, 'tcx: 'a>(
let fn_ty = func.layout().ty; let fn_ty = func.layout().ty;
let sig = ty_fn_sig(fx.tcx, fn_ty); let sig = ty_fn_sig(fx.tcx, fn_ty);
let return_place = destination
.as_ref()
.map(|(place, _)| trans_place(fx, place));
// Unpack arguments tuple for closures // Unpack arguments tuple for closures
let args = if sig.abi == Abi::RustCall { let args = if sig.abi == Abi::RustCall {
assert_eq!(args.len(), 2, "rust-call abi requires two arguments"); assert_eq!(args.len(), 2, "rust-call abi requires two arguments");
@ -351,8 +347,8 @@ pub fn codegen_call<'a, 'tcx: 'a>(
let intrinsic = fx.tcx.item_name(def_id).as_str(); let intrinsic = fx.tcx.item_name(def_id).as_str();
let intrinsic = &intrinsic[..]; let intrinsic = &intrinsic[..];
let ret = match return_place { let ret = match destination {
Some(ret) => ret, Some((place, _)) => trans_place(fx, place),
None => { None => {
println!( println!(
"codegen_call(fx, {:?}, {:?}, {:?})", "codegen_call(fx, {:?}, {:?}, {:?})",
@ -384,8 +380,8 @@ pub fn codegen_call<'a, 'tcx: 'a>(
} }
} }
let return_ptr = match return_place { let return_ptr = match destination {
Some(place) => place.expect_addr(), Some((place, _)) => trans_place(fx, place).expect_addr(),
None => fx.bcx.ins().iconst(types::I64, 0), None => fx.bcx.ins().iconst(types::I64, 0),
}; };