diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-03-08 21:26:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-08 21:26:51 +0100 |
| commit | 4e84fbf8a0545fd750dfb9bfe262d782d1398a77 (patch) | |
| tree | 20c3c538ac48c2022fe209ade2a18662e34cf0f9 /compiler/rustc_codegen_cranelift/src | |
| parent | 2428083558a3c9ab1483c299080a4b784a187b6e (diff) | |
| parent | 153bfa06e5b8ff57ac5d9274c174c8230a7399eb (diff) | |
| download | rust-4e84fbf8a0545fd750dfb9bfe262d782d1398a77.tar.gz rust-4e84fbf8a0545fd750dfb9bfe262d782d1398a77.zip | |
Rollup merge of #108856 - Zeegomo:remove-drop-and-rep, r=tmiasko
Remove DropAndReplace terminator #107844 made DropAndReplace unused, let's remove it completely from the codebase.
Diffstat (limited to 'compiler/rustc_codegen_cranelift/src')
| -rw-r--r-- | compiler/rustc_codegen_cranelift/src/base.rs | 1 | ||||
| -rw-r--r-- | compiler/rustc_codegen_cranelift/src/constant.rs | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/compiler/rustc_codegen_cranelift/src/base.rs b/compiler/rustc_codegen_cranelift/src/base.rs index 7f857528c7c..cb0e272ceda 100644 --- a/compiler/rustc_codegen_cranelift/src/base.rs +++ b/compiler/rustc_codegen_cranelift/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/compiler/rustc_codegen_cranelift/src/constant.rs b/compiler/rustc_codegen_cranelift/src/constant.rs index 49c4f1aaaef..1930db72ead 100644 --- a/compiler/rustc_codegen_cranelift/src/constant.rs +++ b/compiler/rustc_codegen_cranelift/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!(), |