mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the rustc_mir::transform entry point for mir-borrowck.

Browse Source
This commit is contained in:
Felix S. Klock II 2017-08-21 11:04:15 +02:00
parent 4da2a88abc
commit c280afcc1c
2 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/librustc_driver/driver.rs
View File

@ -983,10 +983,6 @@ 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);

25
src/librustc_mir/transform/borrow_check.rs
View File

@ -15,7 +15,7 @@ use rustc::ty::{self, TyCtxt, ParamEnv};
use rustc::mir::{AssertMessage, BasicBlock, BorrowKind, Location, Lvalue};
use rustc::mir::{Mir, Mutability, Operand, Projection, ProjectionElem, Rvalue};
use rustc::mir::{Statement, StatementKind, Terminator, TerminatorKind};
use rustc::mir::transform::{MirPass, MirSource};
use rustc::mir::transform::{MirSource};
use rustc_data_structures::indexed_set::{self, IdxSetBuf};
use rustc_data_structures::indexed_vec::{Idx};
@ -34,29 +34,6 @@ use util::borrowck_errors::{BorrowckErrors, Origin};
use self::MutateMode::{JustWrite, WriteAndRead};
use self::ConsumeKind::{Consume};
pub struct BorrowckMir;
impl MirPass for BorrowckMir {
fn run_pass<'a, 'tcx>(&self, tcx: TyCtxt<'a, 'tcx, 'tcx>, src: MirSource, mir: &mut Mir<'tcx>) {
// let err_count = tcx.sess.err_count();
// if err_count > 0 {
// // compiling a broken program can obviously result in a
// // broken MIR, so try not to report duplicate errors.
// debug!("skipping BorrowckMir: {} due to {} previous errors",
// tcx.node_path_str(src.item_id()), err_count);
// return;
// }
debug!("run_pass BorrowckMir: {}", tcx.node_path_str(src.item_id()));
let def_id = tcx.hir.local_def_id(src.item_id());
if tcx.has_attr(def_id, "rustc_mir_borrowck") || tcx.sess.opts.debugging_opts.borrowck_mir {
borrowck_mir(tcx, src, mir);
}
}
}
pub(crate) fn borrowck_mir<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, src: MirSource, mir: &Mir<'tcx>)
{
let id = src.item_id();