use correct span for assign in a replace op

Author: zeegomo

compiler/rustc_mir_build/src/build/expr/stmt.rs

@@ -39,12 +39,19 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
 
                 // Generate better code for things that don't need to be
                 // dropped.
-
                 let needs_drop = lhs.ty.needs_drop(this.tcx, this.param_env);
                 let rhs = unpack!(block = this.as_local_rvalue(block, rhs));
                 let lhs = unpack!(block = this.as_place(block, lhs));
                 if needs_drop {
-                    unpack!(block = this.build_drop_and_replace(block, lhs_span, lhs, rhs.clone()));
+                    unpack!(
+                        block = this.build_drop_and_replace(
+                            block,
+                            source_info,
+                            lhs_span,
+                            lhs,
+                            rhs.clone()
+                        )
+                    );
                 }
                 this.cfg.push_assign(block, source_info, lhs, rhs);
                 this.block_context.pop();

compiler/rustc_mir_build/src/build/scope.rs

@@ -1125,6 +1125,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
     pub(crate) fn build_drop_and_replace(
         &mut self,
         block: BasicBlock,
+        statement_source_info: SourceInfo,
         span: Span,
         place: Place<'tcx>,
         value: Rvalue<'tcx>,
@@ -1133,8 +1134,8 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         let next_target = self.cfg.start_new_block();
 
         let assign = self.cfg.start_new_cleanup_block();
-        self.cfg.push_assign(assign, source_info, place, value.clone());
-        self.cfg.terminate(assign, source_info, TerminatorKind::Goto { target: block });
+        self.cfg.push_assign(assign, statement_source_info, place, value.clone());
+        self.cfg.terminate(assign, statement_source_info, TerminatorKind::Goto { target: block });
 
         self.cfg.terminate(
             block,