bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Deduplicate span and dbg_scope adjustment

Browse source
This commit is contained in:
oli 2020-10-26 13:04:52 +00:00
parent f8aae50469
commit 7101ce9127
1 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

37
compiler/rustc_codegen_ssa/src/mir/debuginfo.rs
View file

@ -83,10 +83,17 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
} }
fn dbg_loc(&self, source_info: mir::SourceInfo) -> Option<Bx::DILocation> { fn dbg_loc(&self, source_info: mir::SourceInfo) -> Option<Bx::DILocation> {
let (dbg_scope, inlined_at, span) = self.adjusted_span_and_dbg_scope(source_info)?;
Some(self.cx.dbg_loc(dbg_scope, inlined_at, span))
}
fn adjusted_span_and_dbg_scope(
&self,
source_info: mir::SourceInfo,
) -> Option<(Bx::DIScope, Option<Bx::DILocation>, Span)> {
let span = self.adjust_span_for_debugging(source_info.span); let span = self.adjust_span_for_debugging(source_info.span);
let scope = &self.debug_context.as_ref()?.scopes[source_info.scope]; let scope = &self.debug_context.as_ref()?.scopes[source_info.scope];
let dbg_scope = scope.adjust_dbg_scope_for_span(self.cx, span); Some((scope.adjust_dbg_scope_for_span(self.cx, span), scope.inlined_at, span))
Some(self.cx.dbg_loc(dbg_scope, scope.inlined_at, span))
} }
/// In order to have a good line stepping behavior in debugger, we overwrite debug /// In order to have a good line stepping behavior in debugger, we overwrite debug
@ -148,18 +155,16 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
let name = kw::Invalid; let name = kw::Invalid;
let decl = &self.mir.local_decls[local]; let decl = &self.mir.local_decls[local];
let dbg_var = if full_debug_info { let dbg_var = if full_debug_info {
self.debug_context.as_ref().map(|debug_context| { self.adjusted_span_and_dbg_scope(decl.source_info).map(
// FIXME(eddyb) is this `+ 1` needed at all? |(dbg_scope, _, span)| {
let kind = VariableKind::ArgumentVariable(arg_index + 1); // FIXME(eddyb) is this `+ 1` needed at all?
let kind = VariableKind::ArgumentVariable(arg_index + 1);
let arg_ty = self.monomorphize(&decl.ty); let arg_ty = self.monomorphize(&decl.ty);
let span = self.adjust_span_for_debugging(decl.source_info.span); self.cx.create_dbg_var(name, arg_ty, dbg_scope, kind, span)
let scope = &debug_context.scopes[decl.source_info.scope]; },
let dbg_scope = scope.adjust_dbg_scope_for_span(self.cx, span); )
self.cx.create_dbg_var(name, arg_ty, dbg_scope, kind, span)
})
} else { } else {
None None
}; };
@ -313,15 +318,11 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
let mut per_local = IndexVec::from_elem(vec![], &self.mir.local_decls); let mut per_local = IndexVec::from_elem(vec![], &self.mir.local_decls);
for var in &self.mir.var_debug_info { for var in &self.mir.var_debug_info {
let dbg_scope_and_span = if full_debug_info { let dbg_scope_and_span = if full_debug_info {
self.debug_context.as_ref().map(|debug_context| { self.adjusted_span_and_dbg_scope(var.source_info)
let span = self.adjust_span_for_debugging(var.source_info.span);
let scope = &debug_context.scopes[var.source_info.scope];
(scope.adjust_dbg_scope_for_span(self.cx, span), span)
})
} else { } else {
None None
}; };
let dbg_var = dbg_scope_and_span.map(|(dbg_scope, span)| { let dbg_var = dbg_scope_and_span.map(|(dbg_scope, _, span)| {
let place = var.place; let place = var.place;
let var_ty = self.monomorphized_place_ty(place.as_ref()); let var_ty = self.monomorphized_place_ty(place.as_ref());
let var_kind = if self.mir.local_kind(place.local) == mir::LocalKind::Arg let var_kind = if self.mir.local_kind(place.local) == mir::LocalKind::Arg