Skip to content

Commit 275cb05

Browse files
eddybeddyb
committed
rustc_mir: track inlined callees in SourceScopeData.
1 parent 5a343c8 commit 275cb05

File tree

14 files changed

+87
-38
lines changed

14 files changed

+87
-38
lines changed

‎src/librustc/mir/mod.rs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ pub struct Body<'tcx> {
112112

113113
/// A list of source scopes; these are referenced by statements
114114
/// and used for debuginfo. Indexed by a `SourceScope`.
115-
pub source_scopes: IndexVec<SourceScope, SourceScopeData>,
115+
pub source_scopes: IndexVec<SourceScope, SourceScopeData<'tcx>>,
116116

117117
/// The yield type of the function, if it is a generator.
118118
pub yield_ty: Option<Ty<'tcx>>,
@@ -179,7 +179,7 @@ pub struct Body<'tcx> {
179179
impl<'tcx> Body<'tcx> {
180180
pub fn new(
181181
basic_blocks: IndexVec<BasicBlock, BasicBlockData<'tcx>>,
182-
source_scopes: IndexVec<SourceScope, SourceScopeData>,
182+
source_scopes: IndexVec<SourceScope, SourceScopeData<'tcx>>,
183183
local_decls: LocalDecls<'tcx>,
184184
user_type_annotations: CanonicalUserTypeAnnotations<'tcx>,
185185
arg_count: usize,
@@ -1916,11 +1916,16 @@ rustc_index::newtype_index! {
19161916
}
19171917
}
19181918

1919-
#[derive(Clone, Debug, RustcEncodable, RustcDecodable, HashStable)]
1920-
pub struct SourceScopeData {
1919+
#[derive(Clone, Debug, RustcEncodable, RustcDecodable, HashStable, TypeFoldable)]
1920+
pub struct SourceScopeData<'tcx> {
19211921
pub span: Span,
19221922
pub parent_scope: Option<SourceScope>,
19231923

1924+
/// Whether this scope is the root of a scope tree of another body,
1925+
/// inlined into this body by the MIR inliner.
1926+
/// `ty::Instance` is the callee, and the `Span` is the call site.
1927+
pub inlined: Option<(ty::Instance<'tcx>, Span)>,
1928+
19241929
/// Crate-local information for this source scope, that can't (and
19251930
/// needn't) be tracked across crates.
19261931
pub local_data: ClearCrossCrate<SourceScopeLocalData>,
@@ -2621,7 +2626,6 @@ CloneTypeFoldableAndLiftImpls! {
26212626
FakeReadCause,
26222627
RetagKind,
26232628
SourceScope,
2624-
SourceScopeData,
26252629
SourceScopeLocalData,
26262630
UserTypeAnnotationIndex,
26272631
}

‎src/librustc/mir/visit.rs

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ macro_rules! make_mir_visitor {
9494
}
9595

9696
fn visit_source_scope_data(&mut self,
97-
scope_data: & $($mutability)? SourceScopeData) {
97+
scope_data: & $($mutability)? SourceScopeData<'tcx>) {
9898
self.super_source_scope_data(scope_data);
9999
}
100100

@@ -329,17 +329,45 @@ macro_rules! make_mir_visitor {
329329
}
330330
}
331331

332-
fn super_source_scope_data(&mut self, scope_data: & $($mutability)? SourceScopeData) {
332+
fn super_source_scope_data(
333+
&mut self,
334+
scope_data: & $($mutability)? SourceScopeData<'tcx>,
335+
) {
333336
let SourceScopeData {
334337
span,
335338
parent_scope,
339+
inlined,
336340
local_data: _,
337341
} = scope_data;
338342

339343
self.visit_span(span);
340344
if let Some(parent_scope) = parent_scope {
341345
self.visit_source_scope(parent_scope);
342346
}
347+
if let Some((callee, callsite_span)) = inlined {
348+
let location = START_BLOCK.start_location();
349+
350+
self.visit_span(callsite_span);
351+
352+
let ty::Instance { def: callee_def, substs: callee_substs } = callee;
353+
match callee_def {
354+
ty::InstanceDef::Item(_def_id) |
355+
ty::InstanceDef::Intrinsic(_def_id) |
356+
ty::InstanceDef::VtableShim(_def_id) |
357+
ty::InstanceDef::ReifyShim(_def_id) |
358+
ty::InstanceDef::Virtual(_def_id, _) |
359+
ty::InstanceDef::ClosureOnceShim { call_once: _def_id } |
360+
ty::InstanceDef::DropGlue(_def_id, None) => {}
361+
362+
ty::InstanceDef::FnPtrShim(_def_id, ty) |
363+
ty::InstanceDef::DropGlue(_def_id, Some(ty)) |
364+
ty::InstanceDef::CloneShim(_def_id, ty) => {
365+
// FIXME(eddyb) use a better `TyContext` here.
366+
self.visit_ty(ty, TyContext::Location(location));
367+
}
368+
}
369+
self.visit_substs(callee_substs, location);
370+
}
343371
}
344372

345373
fn super_statement(&mut self,

‎src/librustc_mir/shim.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,12 @@ fn new_body<'tcx>(
243243
Body::new(
244244
basic_blocks,
245245
IndexVec::from_elem_n(
246-
SourceScopeData { span, parent_scope: None, local_data: ClearCrossCrate::Clear },
246+
SourceScopeData {
247+
span,
248+
parent_scope: None,
249+
inlined: None,
250+
local_data: ClearCrossCrate::Clear,
251+
},
247252
1,
248253
),
249254
local_decls,

‎src/librustc_mir/transform/const_prop.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ struct ConstPropagator<'mir, 'tcx> {
297297
param_env: ParamEnv<'tcx>,
298298
// FIXME(eddyb) avoid cloning these two fields more than once,
299299
// by accessing them through `ecx` instead.
300-
source_scopes: IndexVec<SourceScope, SourceScopeData>,
300+
source_scopes: IndexVec<SourceScope, SourceScopeData<'tcx>>,
301301
local_decls: IndexVec<Local, LocalDecl<'tcx>>,
302302
ret: Option<OpTy<'tcx, ()>>,
303303
// Because we have `MutVisitor` we can't obtain the `SourceInfo` from a `Location`. So we store

‎src/librustc_mir/transform/inline.rs

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ impl Inliner<'tcx> {
109109
let callee_node_id = self.tcx.hir().as_local_node_id(callsite.callee.def_id());
110110

111111
let callee_body = if let Some(callee_node_id) = callee_node_id {
112-
// Avoid a cycle here by only using `optimized_mir` only if we have
112+
// Avoid a cycle here by only using `instance_mir` only if we have
113113
// a lower node id than the callee. This ensures that the callee will
114114
// not inline us. This trick only works without incremental compilation.
115115
// So don't do it if that is enabled.
@@ -416,15 +416,11 @@ impl Inliner<'tcx> {
416416
for mut scope in callee_body.source_scopes.iter().cloned() {
417417
if scope.parent_scope.is_none() {
418418
scope.parent_scope = Some(callsite.source_info.scope);
419-
// FIXME(eddyb) is this really needed?
420-
// (also note that it's always overwritten below)
421-
scope.span = callee_body.span;
422-
}
423419

424-
// FIXME(eddyb) this doesn't seem right at all.
425-
// The inlined source scopes should probably be annotated as
426-
// such, but also contain all of the original information.
427-
scope.span = callsite.source_info.span;
420+
// Mark the outermost callee scope as an inlined one.
421+
assert_eq!(scope.inlined, None);
422+
scope.inlined = Some((callsite.callee, callsite.source_info.span));
423+
}
428424

429425
let idx = caller_body.source_scopes.push(scope);
430426
scope_map.push(idx);

‎src/librustc_mir/util/pretty.rs

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -495,8 +495,23 @@ fn write_scope_tree(
495495
};
496496

497497
for &child in children {
498-
assert_eq!(body.source_scopes[child].parent_scope, Some(parent));
499-
writeln!(w, "{0:1$}scope {2} {{", "", indent, child.index())?;
498+
let child_data = &body.source_scopes[child];
499+
assert_eq!(child_data.parent_scope, Some(parent));
500+
501+
if let Some((callee, callsite_span)) = child_data.inlined {
502+
let indented_header =
503+
format!("{0:1$}scope {2} (inlined {3}) {{", "", indent, child.index(), callee);
504+
writeln!(
505+
w,
506+
"{0:1$} // at {2}",
507+
indented_header,
508+
ALIGN,
509+
tcx.sess.source_map().span_to_string(callsite_span),
510+
)?;
511+
} else {
512+
writeln!(w, "{0:1$}scope {2} {{", "", indent, child.index())?;
513+
}
514+
500515
write_scope_tree(tcx, body, scope_tree, w, child, depth + 1)?;
501516
writeln!(w, "{0:1$}}}", "", depth * INDENT.len())?;
502517
}

‎src/librustc_mir_build/build/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ struct Builder<'a, 'tcx> {
298298

299299
/// The vector of all scopes that we have created thus far;
300300
/// we track this for debuginfo later.
301-
source_scopes: IndexVec<SourceScope, SourceScopeData>,
301+
source_scopes: IndexVec<SourceScope, SourceScopeData<'tcx>>,
302302
source_scope: SourceScope,
303303

304304
/// The guard-context: each time we build the guard expression for

‎src/librustc_mir_build/build/scope.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -684,6 +684,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
684684
self.source_scopes.push(SourceScopeData {
685685
span,
686686
parent_scope: Some(parent),
687+
inlined: None,
687688
local_data: ClearCrossCrate::Set(scope_local_data),
688689
})
689690
}

‎src/test/mir-opt/inline/inline-closure-borrows-arg.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ fn foo<T: Copy>(_t: T, q: &i32) -> i32 {
3030
// let mut _9: &i32;
3131
// scope 1 {
3232
// debug x => _3;
33-
// scope 2 {
33+
// scope 2 (inlined foo::<T>::{{closure}}#0) {
3434
// debug r => _8;
3535
// debug _s => _9;
3636
// }

‎src/test/mir-opt/inline/inline-closure-captures.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fn foo<T: Copy>(t: T, q: i32) -> (i32, T) {
2626
// let mut _11: i32;
2727
// scope 1 {
2828
// debug x => _3;
29-
// scope 2 {
29+
// scope 2 (inlined foo::<T>::{{closure}}#0) {
3030
// debug _q => _11;
3131
// debug q => (*((*_6).0: &i32));
3232
// debug t => (*((*_6).1: &T));

‎src/test/mir-opt/inline/inline-closure.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fn foo<T: Copy>(_t: T, q: i32) -> i32 {
2626
// let mut _9: i32;
2727
// scope 1 {
2828
// debug x => _3;
29-
// scope 2 {
29+
// scope 2 (inlined foo::<T>::{{closure}}#0) {
3030
// debug _t => _8;
3131
// debug _q => _9;
3232
// }

‎src/test/mir-opt/inline/inline-into-box-place.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ fn main() {
4848
// scope 1 {
4949
// debug _x => _1;
5050
// }
51-
// scope 2 {
51+
// scope 2 (inlined std::vec::Vec::<u32>::new) {
5252
// }
5353
// bb0: {
5454
// StorageLive(_1);

‎src/test/mir-opt/inline/inline-specialization.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ impl<T> Foo for Vec<T> {
3636
// scope 1 {
3737
// debug x => _1;
3838
// }
39-
// scope 2 {
39+
// scope 2 (inlined <std::vec::Vec<()> as Foo>::bar) {
4040
// }
4141
// bb0: {
4242
// StorageLive(_1);

‎src/test/mir-opt/simplify_try.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ fn main() {
2828
// scope 2 {
2929
// debug err => _6;
3030
// scope 3 {
31-
// scope 7 {
31+
// scope 7 (inlined <i32 as std::convert::From<i32>>::from) {
3232
// debug t => _6;
3333
// }
34-
// scope 8 {
34+
// scope 8 (inlined <std::result::Result<u32, i32> as std::ops::Try>::from_error) {
3535
// debug v => _6;
3636
// let mut _12: i32;
3737
// }
@@ -42,7 +42,7 @@ fn main() {
4242
// scope 5 {
4343
// }
4444
// }
45-
// scope 6 {
45+
// scope 6 (inlined <std::result::Result<u32, i32> as std::ops::Try>::into_result) {
4646
// debug self => _1;
4747
// }
4848
// bb0: {
@@ -87,10 +87,10 @@ fn main() {
8787
// scope 2 {
8888
// debug err => _6;
8989
// scope 3 {
90-
// scope 7 {
90+
// scope 7 (inlined <i32 as std::convert::From<i32>>::from) {
9191
// debug t => _6;
9292
// }
93-
// scope 8 {
93+
// scope 8 (inlined <std::result::Result<u32, i32> as std::ops::Try>::from_error) {
9494
// debug v => _6;
9595
// let mut _12: i32;
9696
// }
@@ -101,7 +101,7 @@ fn main() {
101101
// scope 5 {
102102
// }
103103
// }
104-
// scope 6 {
104+
// scope 6 (inlined <std::result::Result<u32, i32> as std::ops::Try>::into_result) {
105105
// debug self => _1;
106106
// }
107107
// bb0: {
@@ -146,10 +146,10 @@ fn main() {
146146
// scope 2 {
147147
// debug err => _6;
148148
// scope 3 {
149-
// scope 7 {
149+
// scope 7 (inlined <i32 as std::convert::From<i32>>::from) {
150150
// debug t => _6;
151151
// }
152-
// scope 8 {
152+
// scope 8 (inlined <std::result::Result<u32, i32> as std::ops::Try>::from_error) {
153153
// debug v => _6;
154154
// let mut _12: i32;
155155
// }
@@ -160,7 +160,7 @@ fn main() {
160160
// scope 5 {
161161
// }
162162
// }
163-
// scope 6 {
163+
// scope 6 (inlined <std::result::Result<u32, i32> as std::ops::Try>::into_result) {
164164
// debug self => _1;
165165
// }
166166
// bb0: {
@@ -192,10 +192,10 @@ fn main() {
192192
// scope 2 {
193193
// debug err => _3;
194194
// scope 3 {
195-
// scope 7 {
195+
// scope 7 (inlined <i32 as std::convert::From<i32>>::from) {
196196
// debug t => _3;
197197
// }
198-
// scope 8 {
198+
// scope 8 (inlined <std::result::Result<u32, i32> as std::ops::Try>::from_error) {
199199
// debug v => _3;
200200
// }
201201
// }
@@ -205,7 +205,7 @@ fn main() {
205205
// scope 5 {
206206
// }
207207
// }
208-
// scope 6 {
208+
// scope 6 (inlined <std::result::Result<u32, i32> as std::ops::Try>::into_result) {
209209
// debug self => _1;
210210
// }
211211
// bb0: {

0 commit comments

Comments
 (0)