diff options
| -rw-r--r-- | src/librustc_driver/driver.rs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/librustc_driver/driver.rs b/src/librustc_driver/driver.rs index 0e4fb075b9c..0c729b5a3fc 100644 --- a/src/librustc_driver/driver.rs +++ b/src/librustc_driver/driver.rs @@ -970,8 +970,12 @@ pub fn phase_3_run_analysis_passes<'tcx, F, R>(sess: &'tcx Session, // We compute "constant qualifications" between MIR_CONST and MIR_VALIDATED. // What we need to run borrowck etc. - passes.push_pass(MIR_CONST, mir::transform::borrow_check::BorrowckMir); + passes.push_pass(MIR_VALIDATED, mir::transform::qualify_consts::QualifyAndPromoteConstants); + + // FIXME: ariel points SimplifyBranches should run after + // mir-borrowck; otherwise code within `if false { ... }` would + // not be checked. passes.push_pass(MIR_VALIDATED, mir::transform::simplify_branches::SimplifyBranches::new("initial")); passes.push_pass(MIR_VALIDATED, mir::transform::simplify::SimplifyCfg::new("qualify-consts")); @@ -979,6 +983,10 @@ pub fn phase_3_run_analysis_passes<'tcx, F, R>(sess: &'tcx Session, // borrowck runs between MIR_VALIDATED and MIR_OPTIMIZED. + // FIXME: niko says this should be a query (see rustc::ty::maps) + // instead of a pass. + passes.push_pass(MIR_VALIDATED, mir::transform::borrow_check::BorrowckMir); + // These next passes must be executed together passes.push_pass(MIR_OPTIMIZED, mir::transform::no_landing_pads::NoLandingPads); passes.push_pass(MIR_OPTIMIZED, mir::transform::add_call_guards::CriticalCallEdges); |