From 0168dfec6d8ec4dcb037401ae0c9c9ec8efcc173 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Mon, 2 Aug 2021 07:27:17 -0700
Subject: [PATCH] Use predefined helper instead of a new one

---
 .../src/transform/abort_unwinding_calls.rs        | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/compiler/rustc_mir/src/transform/abort_unwinding_calls.rs b/compiler/rustc_mir/src/transform/abort_unwinding_calls.rs
index 44287dbd608e..aecb2373eaf3 100644
--- a/compiler/rustc_mir/src/transform/abort_unwinding_calls.rs
+++ b/compiler/rustc_mir/src/transform/abort_unwinding_calls.rs
@@ -125,13 +125,13 @@ impl<'tcx> MirPass<'tcx> for AbortUnwindingCalls {
             let abort_bb = body.basic_blocks_mut().push(bb);
 
             for bb in calls_to_terminate {
-                let cleanup = get_cleanup(body.basic_blocks_mut()[bb].terminator_mut());
+                let cleanup = body.basic_blocks_mut()[bb].terminator_mut().unwind_mut().unwrap();
                 *cleanup = Some(abort_bb);
             }
         }
 
         for id in cleanups_to_remove {
-            let cleanup = get_cleanup(body.basic_blocks_mut()[id].terminator_mut());
+            let cleanup = body.basic_blocks_mut()[id].terminator_mut().unwind_mut().unwrap();
             *cleanup = None;
         }
 
@@ -139,14 +139,3 @@ impl<'tcx> MirPass<'tcx> for AbortUnwindingCalls {
         super::simplify::remove_dead_blocks(tcx, body);
     }
 }
-
-fn get_cleanup<'a>(t: &'a mut Terminator<'_>) -> &'a mut Option<BasicBlock> {
-    match &mut t.kind {
-        TerminatorKind::Call { cleanup, .. }
-        | TerminatorKind::Drop { unwind: cleanup, .. }
-        | TerminatorKind::DropAndReplace { unwind: cleanup, .. }
-        | TerminatorKind::Assert { cleanup, .. }
-        | TerminatorKind::FalseUnwind { unwind: cleanup, .. } => cleanup,
-        _ => unreachable!(),
-    }
-}