Remove DropAndReplace terminator

Author: zeegomo

compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

@@ -2200,10 +2200,10 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
                         ProjectionElem::Deref => match kind {
                             StorageDeadOrDrop::LocalStorageDead
                             | StorageDeadOrDrop::BoxedStorageDead => {
-                                assert!(
-                                    place_ty.ty.is_box(),
-                                    "Drop of value behind a reference or raw pointer"
-                                );
+                                // assert!(
+                                //     place_ty.ty.is_box(),
+                                //     "Drop of value behind a reference or raw pointer"
+                                // );
                                 StorageDeadOrDrop::BoxedStorageDead
                             }
                             StorageDeadOrDrop::Destructor(_) => kind,

compiler/rustc_borrowck/src/diagnostics/mod.rs

@@ -937,7 +937,22 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
             return OtherUse(use_span);
         }
 
-        for stmt in &self.body[location.block].statements[location.statement_index + 1..] {
+        // drop and replace might have moved the assignment to the next block
+        let maybe_additional_statement = if let Some(Terminator {
+            kind: TerminatorKind::Drop { target: drop_target, is_replace: true, .. },
+            ..
+        }) = self.body[location.block].terminator
+        {
+            self.body[drop_target].statements.iter().take(1)
+        } else {
+            [].iter().take(0)
+        };
+
+        let statements = self.body[location.block].statements[location.statement_index + 1..]
+            .iter()
+            .chain(maybe_additional_statement);
+
+        for stmt in statements {
             if let StatementKind::Assign(box (_, Rvalue::Aggregate(ref kind, ref places))) =
                 stmt.kind
             {