diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2016-01-21 13:19:20 +1300 |
|---|---|---|
| committer | Nick Cameron <ncameron@mozilla.com> | 2016-01-26 17:51:11 +1300 |
| commit | 0b511e82abe48f40808453de2f013e7c5ebab4c3 (patch) | |
| tree | 37bf874ace5ff71ac0358c4b976d35349268037b /src/test/run-make/execution-engine | |
| parent | faf6d1e87391b25196b35909c3c95e5d873cacf0 (diff) | |
| download | rust-0b511e82abe48f40808453de2f013e7c5ebab4c3.tar.gz rust-0b511e82abe48f40808453de2f013e7c5ebab4c3.zip | |
Initial work towards abort-free compilation
The goal is that the compiler will pass `Result`s around rather than using abort_if_errors. To preserve behaviour we currently abort at the top level. I've removed all other aborts from the driver, but haven't touched any of the nested aborts.
Diffstat (limited to 'src/test/run-make/execution-engine')
| -rw-r--r-- | src/test/run-make/execution-engine/test.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/run-make/execution-engine/test.rs b/src/test/run-make/execution-engine/test.rs index dc409f393a8..fe6a5faf932 100644 --- a/src/test/run-make/execution-engine/test.rs +++ b/src/test/run-make/execution-engine/test.rs @@ -32,7 +32,7 @@ use rustc::middle::cstore::{CrateStore, LinkagePreference}; use rustc::middle::ty; use rustc::session::config::{self, basic_options, build_configuration, Input, Options}; use rustc::session::build_session; -use rustc_driver::driver; +use rustc_driver::{driver, abort_on_err}; use rustc_front::lowering::{lower_crate, LoweringContext}; use rustc_resolve::MakeGlobMap; use rustc_metadata::cstore::CStore; @@ -234,7 +234,7 @@ fn compile_program(input: &str, sysroot: PathBuf) let arenas = ty::CtxtArenas::new(); let ast_map = driver::make_map(&sess, &mut hir_forest); - driver::phase_3_run_analysis_passes( + abort_on_err(driver::phase_3_run_analysis_passes( &sess, &cstore, ast_map, &arenas, &id, MakeGlobMap::No, |tcx, mir_map, analysis| { @@ -254,7 +254,7 @@ fn compile_program(input: &str, sysroot: PathBuf) let modp = llmod as usize; (modp, deps) - }) + }), &sess) }).unwrap(); match handle.join() { |
