Rustup to rustc 1.46.0-nightly (a37c32e2d 2020-06-11)

diff --git a/rust-toolchain b/rust-toolchain
index 532598108c5243423c4870e797ecbdb83483f406..b68fcc008f9c70a0d418c221a029e4d8ce97e674 100644 (file)
--- 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 fb51e4badce4585fadda219b9ad660a2ffa65308..34c2020472628e0cadc00ed9165df43bf71d2fbf 100644 (file)
--- 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,