diff options
Diffstat (limited to 'src/test/run-make/execution-engine')
| -rw-r--r-- | src/test/run-make/execution-engine/test.rs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/test/run-make/execution-engine/test.rs b/src/test/run-make/execution-engine/test.rs index b9a45c09626..98412c08df5 100644 --- a/src/test/run-make/execution-engine/test.rs +++ b/src/test/run-make/execution-engine/test.rs @@ -34,7 +34,6 @@ use rustc::ty; use rustc::session::config::{self, basic_options, build_configuration, Input, Options}; use rustc::session::build_session; use rustc_driver::{driver, abort_on_err}; -use rustc::hir::lowering::{lower_crate, LoweringContext}; use rustc_resolve::MakeGlobMap; use rustc_metadata::creader::LocalCrateReader; use rustc_metadata::cstore::CStore; @@ -243,14 +242,16 @@ fn compile_program(input: &str, sysroot: PathBuf) let krate = driver::assign_node_ids(&sess, krate); let defs = RefCell::new(ast_map::collect_definitions(&krate)); LocalCrateReader::new(&sess, &cstore, &defs, &krate, &id).read_crates(&dep_graph); - let lcx = LoweringContext::new(&sess, Some(&krate), &defs); - let mut hir_forest = ast_map::Forest::new(lower_crate(&lcx, &krate), dep_graph); + let (analysis, resolutions, mut hir_forest) = { + let defs = &mut *defs.borrow_mut(); + driver::lower_and_resolve(&sess, &id, defs, &krate, dep_graph, MakeGlobMap::No) + }; let arenas = ty::CtxtArenas::new(); let ast_map = ast_map::map_crate(&mut hir_forest, &defs); abort_on_err(driver::phase_3_run_analysis_passes( - &sess, ast_map, &arenas, &id, - MakeGlobMap::No, |tcx, mir_map, analysis, _| { + &sess, ast_map, analysis, resolutions, &arenas, &id, + |tcx, mir_map, analysis, _| { let trans = driver::phase_4_translate_to_llvm(tcx, mir_map.unwrap(), analysis); |