Rollup merge of #108856 - Zeegomo:remove-drop-and-rep, r=tmiasko

matthiaskrgr · web-flow · commit 2ad8e1fb51bb · 2023-03-08T21:26:51.000+01:00
Remove DropAndReplace terminator #107844 made DropAndReplace unused, let's remove it completely from the codebase.
diff --git a/src/base.rs b/src/base.rs
@@ -499,7 +499,6 @@ fn codegen_fn_body(fx: &mut FunctionCx<'_, '_, '_>, start_block: Block) {
             TerminatorKind::Yield { .. }
             | TerminatorKind::FalseEdge { .. }
             | TerminatorKind::FalseUnwind { .. }
-            | TerminatorKind::DropAndReplace { .. }
             | TerminatorKind::GeneratorDrop => {
                 bug!("shouldn't exist at codegen {:?}", bb_data.terminator());
             }
diff --git a/src/constant.rs b/src/constant.rs
@@ -543,8 +543,7 @@ pub(crate) fn mir_operand_get_const_val<'tcx>(
                     | TerminatorKind::Unreachable
                     | TerminatorKind::Drop { .. }
                     | TerminatorKind::Assert { .. } => {}
-                    TerminatorKind::DropAndReplace { .. }
-                    | TerminatorKind::Yield { .. }
+                    TerminatorKind::Yield { .. }
                     | TerminatorKind::GeneratorDrop
                     | TerminatorKind::FalseEdge { .. }
                     | TerminatorKind::FalseUnwind { .. } => unreachable!(),

Original file line number	Diff line number	Diff line change
`@@ -499,7 +499,6 @@ fn codegen_fn_body(fx: &mut FunctionCx<'_, '_, '_>, start_block: Block) {`
`499`	`499`	`TerminatorKind::Yield { .. }`
`500`	`500`	`\| TerminatorKind::FalseEdge { .. }`
`501`	`501`	`\| TerminatorKind::FalseUnwind { .. }`
`502`		`- \| TerminatorKind::DropAndReplace { .. }`
`503`	`502`	`\| TerminatorKind::GeneratorDrop => {`
`504`	`503`	`bug!("shouldn't exist at codegen {:?}", bb_data.terminator());`
`505`	`504`	`}`