Auto merge of #48379 - nikomatsakis:issue-48251-beta, r=Mark-Simulacrum

[beta] temporarily disable #46833 due to #48251

see also #48378

r? @Mark-Simulacrum

Author: bors

src/librustc_mir/build/mod.rs

@@ -372,7 +372,9 @@ fn should_abort_on_panic<'a, 'gcx, 'tcx>(tcx: TyCtxt<'a, 'gcx, 'tcx>,
     // unwind anyway. Don't stop them.
     if tcx.has_attr(tcx.hir.local_def_id(fn_id), "unwind") { return false; }
 
-    return true;
+    // FIXME(rust-lang/rust#48251) -- Had to disable abort-on-panic
+    // for backwardsa compatibility reasons.
+    false
 }
 
 ///////////////////////////////////////////////////////////////////////////

src/test/run-pass/abort-on-c-abi.rs

@@ -13,6 +13,7 @@
 
 // ignore-cloudabi no env and process
 // ignore-emscripten no processes
+// ignore-test FIXME rust-lang/rust#48251 -- temporarily disabled
 
 use std::{env, panic};
 use std::io::prelude::*;