Update more use sites of PanicStrategy::Abort

Author: saethlin

compiler/rustc_codegen_gcc/src/intrinsic/mod.rs

@@ -1339,7 +1339,7 @@ fn try_intrinsic<'a, 'b, 'gcc, 'tcx>(
     _catch_func: RValue<'gcc>,
     dest: PlaceRef<'tcx, RValue<'gcc>>,
 ) {
-    if bx.sess().panic_strategy() == PanicStrategy::Abort {
+    if matches!(bx.sess().panic_strategy(), PanicStrategy::Abort | PanicStrategy::ImmediateAbort) {
         bx.call(bx.type_void(), None, None, try_func, &[data], None, None);
         // Return 0 unconditionally from the intrinsic call;
         // we can never unwind.

compiler/rustc_codegen_llvm/src/intrinsic.rs

@@ -674,7 +674,7 @@ fn catch_unwind_intrinsic<'ll, 'tcx>(
     catch_func: &'ll Value,
     dest: PlaceRef<'tcx, &'ll Value>,
 ) {
-    if bx.sess().panic_strategy() == PanicStrategy::Abort {
+    if matches!(bx.sess().panic_strategy(), PanicStrategy::Abort | PanicStrategy::ImmediateAbort) {
         let try_func_ty = bx.type_func(&[bx.type_ptr()], bx.type_void());
         bx.call(try_func_ty, None, None, try_func, &[data], None, None);
         // Return 0 unconditionally from the intrinsic call;

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -2512,7 +2512,10 @@ fn add_order_independent_options(
     if sess.target.os == "emscripten" {
         cmd.cc_arg(if sess.opts.unstable_opts.emscripten_wasm_eh {
             "-fwasm-exceptions"
-        } else if sess.panic_strategy() == PanicStrategy::Abort {
+        } else if matches!(
+            sess.panic_strategy(),
+            PanicStrategy::Abort | PanicStrategy::ImmediateAbort
+        ) {
             "-sDISABLE_EXCEPTION_CATCHING=1"
         } else {
             "-sDISABLE_EXCEPTION_CATCHING=0"

compiler/rustc_interface/src/passes.rs

@@ -272,7 +272,7 @@ fn configure_and_expand(
         feature_err(sess, sym::export_stable, DUMMY_SP, "`sdylib` crate type is unstable").emit();
     }
 
-    if is_proc_macro_crate && sess.panic_strategy() == PanicStrategy::Abort {
+    if is_proc_macro_crate && sess.panic_strategy() != PanicStrategy::Unwind {
         sess.dcx().emit_warn(errors::ProcMacroCratePanicAbort);
     }
 

compiler/rustc_middle/src/ty/layout.rs

@@ -1193,16 +1193,20 @@ pub fn fn_can_unwind(tcx: TyCtxt<'_>, fn_def_id: Option<DefId>, abi: ExternAbi)
         //
         // Note that this is true regardless ABI specified on the function -- a `extern "C-unwind"`
         // function defined in Rust is also required to abort.
-        if tcx.sess.panic_strategy() == PanicStrategy::Abort && !tcx.is_foreign_item(did) {
+        if matches!(tcx.sess.panic_strategy(), PanicStrategy::Abort | PanicStrategy::ImmediateAbort)
+            && !tcx.is_foreign_item(did)
+        {
             return false;
         }
 
         // With -Z panic-in-drop=abort, drop_in_place never unwinds.
         //
         // This is not part of `codegen_fn_attrs` as it can differ between crates
         // and therefore cannot be computed in core.
-        if tcx.sess.opts.unstable_opts.panic_in_drop == PanicStrategy::Abort
-            && tcx.is_lang_item(did, LangItem::DropInPlace)
+        if matches!(
+            tcx.sess.opts.unstable_opts.panic_in_drop,
+            PanicStrategy::Abort | PanicStrategy::ImmediateAbort
+        ) && tcx.is_lang_item(did, LangItem::DropInPlace)
         {
             return false;
         }

compiler/rustc_mir_transform/src/coroutine.rs

@@ -1149,7 +1149,7 @@ fn can_return<'tcx>(tcx: TyCtxt<'tcx>, body: &Body<'tcx>, typing_env: ty::Typing
 
 fn can_unwind<'tcx>(tcx: TyCtxt<'tcx>, body: &Body<'tcx>) -> bool {
     // Nothing can unwind when landing pads are off.
-    if tcx.sess.panic_strategy() == PanicStrategy::Abort {
+    if matches!(tcx.sess.panic_strategy(), PanicStrategy::Abort | PanicStrategy::ImmediateAbort) {
         return false;
     }
 

compiler/rustc_mir_transform/src/remove_noop_landing_pads.rs

@@ -13,7 +13,7 @@ pub(super) struct RemoveNoopLandingPads;
 
 impl<'tcx> crate::MirPass<'tcx> for RemoveNoopLandingPads {
     fn is_enabled(&self, sess: &rustc_session::Session) -> bool {
-        sess.panic_strategy() != PanicStrategy::Abort
+        !matches!(sess.panic_strategy(), PanicStrategy::Abort | PanicStrategy::ImmediateAbort)
     }
 
     fn run_pass(&self, _tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) {