Rollup merge of rust-lang#111952 - cjgillot:drop-replace, r=WaffleLapkin

GuillaumeGomez · web-flow · commit be82095e1ca0 · 2023-05-27T13:38:31.000+02:00
Remove DesugaringKind::Replace.

A simple boolean flag is enough.
diff --git a/src/base.rs b/src/base.rs
@@ -473,7 +473,7 @@ fn codegen_fn_body(fx: &mut FunctionCx<'_, '_, '_>, start_block: Block) {
             | TerminatorKind::GeneratorDrop => {
                 bug!("shouldn't exist at codegen {:?}", bb_data.terminator());
             }
-            TerminatorKind::Drop { place, target, unwind: _ } => {
+            TerminatorKind::Drop { place, target, unwind: _, replace: _ } => {
                 let drop_place = codegen_place(fx, *place);
                 crate::abi::codegen_drop(fx, source_info, drop_place);
 

Original file line number	Diff line number	Diff line change
`@@ -473,7 +473,7 @@ fn codegen_fn_body(fx: &mut FunctionCx<'_, '_, '_>, start_block: Block) {`
`473`	`473`	`\| TerminatorKind::GeneratorDrop => {`
`474`	`474`	`bug!("shouldn't exist at codegen {:?}", bb_data.terminator());`
`475`	`475`	`}`
`476`		`- TerminatorKind::Drop { place, target, unwind: _ } => {`
	`476`	`+ TerminatorKind::Drop { place, target, unwind: _, replace: _ } => {`
`477`	`477`	`let drop_place = codegen_place(fx, *place);`
`478`	`478`	`crate::abi::codegen_drop(fx, source_info, drop_place);`
`479`	`479`