Skip to content

Commit 059a9a1

Browse files
Nashenas88Nashenas88
committed
Provide positional information when visiting ty, substs and closure_substs in MIR
1 parent 83c659e commit 059a9a1

File tree

4 files changed

+34
-23
lines changed

4 files changed

+34
-23
lines changed

Diff for: ‎src/librustc/mir/visit.rs

+24-15
Original file line numberDiff line numberDiff line change
@@ -210,17 +210,20 @@ macro_rules! make_mir_visitor {
210210
}
211211

212212
fn visit_ty(&mut self,
213-
ty: & $($mutability)* Ty<'tcx>) {
213+
ty: & $($mutability)* Ty<'tcx>,
214+
_: PositionalInfo) {
214215
self.super_ty(ty);
215216
}
216217

217218
fn visit_substs(&mut self,
218-
substs: & $($mutability)* &'tcx Substs<'tcx>) {
219+
substs: & $($mutability)* &'tcx Substs<'tcx>,
220+
_: Location) {
219221
self.super_substs(substs);
220222
}
221223

222224
fn visit_closure_substs(&mut self,
223-
substs: & $($mutability)* ClosureSubsts<'tcx>) {
225+
substs: & $($mutability)* ClosureSubsts<'tcx>,
226+
_: Location) {
224227
self.super_closure_substs(substs);
225228
}
226229

@@ -266,7 +269,7 @@ macro_rules! make_mir_visitor {
266269
self.visit_visibility_scope_data(scope);
267270
}
268271

269-
self.visit_ty(&$($mutability)* mir.return_ty);
272+
self.visit_ty(&$($mutability)* mir.return_ty, PositionalInfo::Span(mir.span));
270273

271274
for local_decl in &$($mutability)* mir.local_decls {
272275
self.visit_local_decl(local_decl);
@@ -385,7 +388,7 @@ macro_rules! make_mir_visitor {
385388
ref values,
386389
ref targets } => {
387390
self.visit_operand(discr, source_location);
388-
self.visit_ty(switch_ty);
391+
self.visit_ty(switch_ty, PositionalInfo::Location(source_location));
389392
for value in &values[..] {
390393
self.visit_const_int(value, source_location);
391394
}
@@ -489,7 +492,7 @@ macro_rules! make_mir_visitor {
489492
ref $($mutability)* operand,
490493
ref $($mutability)* ty) => {
491494
self.visit_operand(operand, location);
492-
self.visit_ty(ty);
495+
self.visit_ty(ty, PositionalInfo::Location(location));
493496
}
494497

495498
Rvalue::BinaryOp(_bin_op,
@@ -511,28 +514,28 @@ macro_rules! make_mir_visitor {
511514
}
512515

513516
Rvalue::NullaryOp(_op, ref $($mutability)* ty) => {
514-
self.visit_ty(ty);
517+
self.visit_ty(ty, PositionalInfo::Location(location));
515518
}
516519

517520
Rvalue::Aggregate(ref $($mutability)* kind,
518521
ref $($mutability)* operands) => {
519522
let kind = &$($mutability)* **kind;
520523
match *kind {
521524
AggregateKind::Array(ref $($mutability)* ty) => {
522-
self.visit_ty(ty);
525+
self.visit_ty(ty, PositionalInfo::Location(location));
523526
}
524527
AggregateKind::Tuple => {
525528
}
526529
AggregateKind::Adt(_adt_def,
527530
_variant_index,
528531
ref $($mutability)* substs,
529532
_active_field_index) => {
530-
self.visit_substs(substs);
533+
self.visit_substs(substs, location);
531534
}
532535
AggregateKind::Closure(ref $($mutability)* def_id,
533536
ref $($mutability)* closure_substs) => {
534537
self.visit_def_id(def_id, location);
535-
self.visit_closure_substs(closure_substs);
538+
self.visit_closure_substs(closure_substs, location);
536539
}
537540
}
538541

@@ -581,7 +584,7 @@ macro_rules! make_mir_visitor {
581584
ref $($mutability)* ty,
582585
} = *static_;
583586
self.visit_def_id(def_id, location);
584-
self.visit_ty(ty);
587+
self.visit_ty(ty, PositionalInfo::Location(location));
585588
}
586589

587590
fn super_projection(&mut self,
@@ -611,7 +614,7 @@ macro_rules! make_mir_visitor {
611614
ProjectionElem::Subslice { from: _, to: _ } => {
612615
}
613616
ProjectionElem::Field(_field, ref $($mutability)* ty) => {
614-
self.visit_ty(ty);
617+
self.visit_ty(ty, PositionalInfo::Location(location));
615618
}
616619
ProjectionElem::Index(ref $($mutability)* operand) => {
617620
self.visit_operand(operand, location);
@@ -635,7 +638,7 @@ macro_rules! make_mir_visitor {
635638
is_user_variable: _,
636639
} = *local_decl;
637640

638-
self.visit_ty(ty);
641+
self.visit_ty(ty, PositionalInfo::SourceInfo(*source_info));
639642
self.visit_source_info(source_info);
640643
}
641644

@@ -658,7 +661,7 @@ macro_rules! make_mir_visitor {
658661
} = *constant;
659662

660663
self.visit_span(span);
661-
self.visit_ty(ty);
664+
self.visit_ty(ty, PositionalInfo::Location(location));
662665
self.visit_literal(literal, location);
663666
}
664667

@@ -669,7 +672,7 @@ macro_rules! make_mir_visitor {
669672
Literal::Item { ref $($mutability)* def_id,
670673
ref $($mutability)* substs } => {
671674
self.visit_def_id(def_id, location);
672-
self.visit_substs(substs);
675+
self.visit_substs(substs, location);
673676
}
674677
Literal::Value { ref $($mutability)* value } => {
675678
self.visit_const_val(value, location);
@@ -734,6 +737,12 @@ macro_rules! make_mir_visitor {
734737
make_mir_visitor!(Visitor,);
735738
make_mir_visitor!(MutVisitor,mut);
736739

740+
pub enum PositionalInfo {
741+
Location(Location),
742+
SourceInfo(SourceInfo),
743+
Span(Span),
744+
}
745+
737746
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
738747
pub enum LvalueContext<'tcx> {
739748
// Appears as LHS of an assignment

Diff for: ‎src/librustc_mir/build/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use rustc::hir::def_id::DefId;
1717
use rustc::middle::region::CodeExtent;
1818
use rustc::mir::*;
1919
use rustc::mir::transform::MirSource;
20-
use rustc::mir::visit::MutVisitor;
20+
use rustc::mir::visit::{MutVisitor, PositionalInfo};
2121
use rustc::ty::{self, Ty, TyCtxt};
2222
use rustc::ty::subst::Substs;
2323
use rustc::util::nodemap::NodeMap;
@@ -143,7 +143,7 @@ struct GlobalizeMir<'a, 'gcx: 'a> {
143143
}
144144

145145
impl<'a, 'gcx: 'tcx, 'tcx> MutVisitor<'tcx> for GlobalizeMir<'a, 'gcx> {
146-
fn visit_ty(&mut self, ty: &mut Ty<'tcx>) {
146+
fn visit_ty(&mut self, ty: &mut Ty<'tcx>, _: PositionalInfo) {
147147
if let Some(lifted) = self.tcx.lift(ty) {
148148
*ty = lifted;
149149
} else {
@@ -153,7 +153,7 @@ impl<'a, 'gcx: 'tcx, 'tcx> MutVisitor<'tcx> for GlobalizeMir<'a, 'gcx> {
153153
}
154154
}
155155

156-
fn visit_substs(&mut self, substs: &mut &'tcx Substs<'tcx>) {
156+
fn visit_substs(&mut self, substs: &mut &'tcx Substs<'tcx>, _: Location) {
157157
if let Some(lifted) = self.tcx.lift(substs) {
158158
*substs = lifted;
159159
} else {

Diff for: ‎src/librustc_mir/transform/erase_regions.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use rustc::ty::subst::Substs;
1616
use rustc::ty::{Ty, TyCtxt, ClosureSubsts};
1717
use rustc::mir::*;
18-
use rustc::mir::visit::MutVisitor;
18+
use rustc::mir::visit::{MutVisitor, PositionalInfo};
1919
use rustc::mir::transform::{MirPass, MirSource};
2020

2121
struct EraseRegionsVisitor<'a, 'tcx: 'a> {
@@ -31,12 +31,12 @@ impl<'a, 'tcx> EraseRegionsVisitor<'a, 'tcx> {
3131
}
3232

3333
impl<'a, 'tcx> MutVisitor<'tcx> for EraseRegionsVisitor<'a, 'tcx> {
34-
fn visit_ty(&mut self, ty: &mut Ty<'tcx>) {
34+
fn visit_ty(&mut self, ty: &mut Ty<'tcx>, _: PositionalInfo) {
3535
let old_ty = *ty;
3636
*ty = self.tcx.erase_regions(&old_ty);
3737
}
3838

39-
fn visit_substs(&mut self, substs: &mut &'tcx Substs<'tcx>) {
39+
fn visit_substs(&mut self, substs: &mut &'tcx Substs<'tcx>, _: Location) {
4040
*substs = self.tcx.erase_regions(&{*substs});
4141
}
4242

@@ -62,7 +62,8 @@ impl<'a, 'tcx> MutVisitor<'tcx> for EraseRegionsVisitor<'a, 'tcx> {
6262
}
6363

6464
fn visit_closure_substs(&mut self,
65-
substs: &mut ClosureSubsts<'tcx>) {
65+
substs: &mut ClosureSubsts<'tcx>,
66+
_: Location) {
6667
*substs = self.tcx.erase_regions(substs);
6768
}
6869

Diff for: ‎src/librustc_passes/mir_stats.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,8 @@ impl<'a, 'tcx> mir_visit::Visitor<'tcx> for StatCollector<'a, 'tcx> {
279279
}
280280

281281
fn visit_closure_substs(&mut self,
282-
substs: &ClosureSubsts<'tcx>) {
282+
substs: &ClosureSubsts<'tcx>,
283+
_: Location) {
283284
self.record("ClosureSubsts", substs);
284285
self.super_closure_substs(substs);
285286
}

0 commit comments

Comments
 (0)