Skip to content

Commit

Permalink
Auto merge of #48379 - nikomatsakis:issue-48251-beta, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
[beta] temporarily disable #46833 due to #48251

see also #48378

r? @Mark-Simulacrum
  • Loading branch information
bors committed Feb 26, 2018
2 parents 5902706 + 61c2258 commit 62ad16c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/librustc_mir/build/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

///////////////////////////////////////////////////////////////////////////
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/abort-on-c-abi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::*;
Expand Down

0 comments on commit 62ad16c

Please sign in to comment.