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 | 2ad8e1fb51bb998d353bbf500c3a6c3544b9110a (patch) | |
| tree | 373793ee159d8552454d883b51c5c2201ca7a9ff | |
| parent | 792933c8d7a454730dc379b12e5028a45e6e4e18 (diff) | |
| parent | bd84d88cd1174025720b5053d78e58fdd0524661 (diff) | |
| download | rust-2ad8e1fb51bb998d353bbf500c3a6c3544b9110a.tar.gz rust-2ad8e1fb51bb998d353bbf500c3a6c3544b9110a.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.
| -rw-r--r-- | src/base.rs | 1 | ||||
| -rw-r--r-- | src/constant.rs | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/base.rs b/src/base.rs index 7f857528c7c..cb0e272ceda 100644 --- 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 index 49c4f1aaaef..1930db72ead 100644 --- 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!(), |