Skip to content

Commit f473ba8

Browse files
committed
Rustup to rustc 1.36.0-nightly (938d4ffe1 2019-04-27)
1 parent 27ea27e commit f473ba8

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/abi.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ fn clif_sig_from_fn_sig<'a, 'tcx: 'a>(tcx: TyCtxt<'a, 'tcx, 'tcx>, sig: FnSig<'t
8787
_ => bug!("argument to function with \"rust-call\" ABI is not a tuple"),
8888
};
8989
let mut inputs: Vec<Ty> = vec![sig.inputs()[0]];
90-
inputs.extend(extra_args.into_iter());
90+
inputs.extend(extra_args.types());
9191
(CallConv::SystemV, inputs, sig.output())
9292
}
9393
Abi::System => bug!("system abi should be selected elsewhere"),
@@ -434,7 +434,7 @@ pub fn codegen_fn_prelude<'a, 'tcx: 'a>(
434434
};
435435

436436
let mut params = Vec::new();
437-
for (i, arg_ty) in tupled_arg_tys.iter().enumerate() {
437+
for (i, arg_ty) in tupled_arg_tys.types().enumerate() {
438438
let param = cvalue_for_param(
439439
fx,
440440
start_ebb,

0 commit comments

Comments
 (0)