Skip to content

Commit

Permalink
Revert "Use the abort strategy when tracing."
Browse files Browse the repository at this point in the history
This reverts commit c8c964a.

The reason for this is that benchmark tests require the unwind strategy and
since benchmarks are mixed with normal tests in the same binary, it means that
all of our tests would have to use the unwind strategy.

See:
ykjit/yk#49 (comment)
  • Loading branch information
vext01 committed Mar 16, 2020
1 parent 2d93224 commit 7479076
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 39 deletions.
8 changes: 1 addition & 7 deletions src/librustc_session/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use crate::{early_error, early_warn, Session};
use rustc_data_structures::fx::FxHashSet;
use rustc_data_structures::impl_stable_hash_via_hash;

use rustc_target::spec::{PanicStrategy, Target, TargetTriple};
use rustc_target::spec::{Target, TargetTriple};

use crate::parse::CrateConfig;
use rustc_feature::UnstableFeatures;
Expand Down Expand Up @@ -1754,12 +1754,6 @@ pub fn build_session_options(matches: &getopts::Matches) -> Options {
early_error(error_format, &format!("optimisation cannot be enabled with a tracer"));
}

// If a tracer is enabled, we use only the abort panic strategy.
if cg.tracer != TracerMode::Off {
cg.panic = Some(PanicStrategy::Abort);
debugging_opts.panic_abort_tests = true;
}

let cg = cg;

// The `-g` and `-C debuginfo` flags specify the same setting, so we want to be able
Expand Down
7 changes: 0 additions & 7 deletions src/test/run-make/yk-abort-strategy-std/Makefile

This file was deleted.

This file was deleted.

7 changes: 0 additions & 7 deletions src/test/run-make/yk-abort-strategy/Makefile

This file was deleted.

9 changes: 0 additions & 9 deletions src/test/run-make/yk-abort-strategy/yk-abort-strategy.rs

This file was deleted.

0 comments on commit 7479076

Please sign in to comment.