From b84c9764db3982c11efc8edd81c29750e5ad7d7d Mon Sep 17 00:00:00 2001 From: bjorn3 Date: Fri, 12 Jun 2020 18:41:50 +0200 Subject: [PATCH] Rustup to rustc 1.46.0-nightly (a37c32e2d 2020-06-11) --- rust-toolchain | 2 +- src/base.rs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rust-toolchain b/rust-toolchain index 532598108c5..b68fcc008f9 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2020-06-11 +nightly-2020-06-12 diff --git a/src/base.rs b/src/base.rs index fb51e4badce..34c20204726 100644 --- a/src/base.rs +++ b/src/base.rs @@ -292,12 +292,13 @@ fn codegen_fn_content(fx: &mut FunctionCx<'_, '_, impl Backend>) { func, args, destination, + fn_span, cleanup: _, from_hir_call: _, } => { fx.tcx.sess.time("codegen call", || crate::abi::codegen_terminator_call( fx, - bb_data.terminator().source_info.span, + *fn_span, block, func, args,