bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

validator: print MIR instance on failure

Browse source
This commit is contained in:
Jonas Schievink 2020-06-14 20:22:13 +02:00
parent 99d30da6a8
commit 9014df55c6
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/librustc_mir/transform/validate.rs
View file

@ -9,7 +9,6 @@ use rustc_middle::{
}, },
ty::{self, ParamEnv, TyCtxt}, ty::{self, ParamEnv, TyCtxt},
}; };
use rustc_span::def_id::DefId;
#[derive(Copy, Clone, Debug)] #[derive(Copy, Clone, Debug)]
enum EdgeKind { enum EdgeKind {
@ -24,15 +23,14 @@ pub struct Validator {
impl<'tcx> MirPass<'tcx> for Validator { impl<'tcx> MirPass<'tcx> for Validator {
fn run_pass(&self, tcx: TyCtxt<'tcx>, source: MirSource<'tcx>, body: &mut Body<'tcx>) { fn run_pass(&self, tcx: TyCtxt<'tcx>, source: MirSource<'tcx>, body: &mut Body<'tcx>) {
let def_id = source.def_id(); let param_env = tcx.param_env(source.def_id());
let param_env = tcx.param_env(def_id); TypeChecker { when: &self.when, source, body, tcx, param_env }.visit_body(body);
TypeChecker { when: &self.when, def_id, body, tcx, param_env }.visit_body(body);
} }
} }
struct TypeChecker<'a, 'tcx> { struct TypeChecker<'a, 'tcx> {
when: &'a str, when: &'a str,
def_id: DefId, source: MirSource<'tcx>,
body: &'a Body<'tcx>, body: &'a Body<'tcx>,
tcx: TyCtxt<'tcx>, tcx: TyCtxt<'tcx>,
param_env: ParamEnv<'tcx>, param_env: ParamEnv<'tcx>,
@ -47,7 +45,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
span, span,
&format!( &format!(
"broken MIR in {:?} ({}) at {:?}:\n{}", "broken MIR in {:?} ({}) at {:?}:\n{}",
self.def_id, self.source.instance,
self.when, self.when,
location, location,
msg.as_ref() msg.as_ref()