Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

debuginfo: Build scope map for consts #22936

Closed
wants to merge 1 commit into from
Closed

debuginfo: Build scope map for consts #22936

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions src/librustc_trans/trans/debuginfo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@
//! comparatively expensive to construct, though, `ty::type_id()` is still used
//! additionally as an optimization for cases where the exact same type has been
//! seen before (which is most of the time).

use self::VariableAccess::*;
use self::VariableKind::*;
use self::MemberOffset::*;
Expand All @@ -200,9 +201,11 @@ use trans::common::{self, NodeIdAndSpan, CrateContext, FunctionContext, Block,
C_bytes, NormalizingClosureTyper};
use trans::_match::{BindingInfo, TrByCopy, TrByMove, TrByRef};
use trans::monomorphize;
use trans::consts;
use trans::type_::Type;
use middle::ty::{self, Ty, ClosureTyper};
use middle::pat_util;
use middle::def;
use session::config::{self, FullDebugInfo, LimitedDebugInfo, NoDebugInfo};
use util::nodemap::{DefIdMap, NodeMap, FnvHashMap, FnvHashSet};
use util::ppaux;
Expand Down Expand Up @@ -3486,8 +3489,20 @@ fn create_scope_map(cx: &CrateContext,
match exp.node {
ast::ExprLit(_) |
ast::ExprBreak(_) |
ast::ExprAgain(_) |
ast::ExprPath(..) => {}
ast::ExprAgain(_) => {}

// see also expr::trans_into
ast::ExprPath(..) => {
let def_map = &cx.tcx().def_map;
let def = def_map.borrow().get(&exp.id).and_then(|pr| Some(pr.full_def()));
match def {
Some(def::DefConst(did)) => {
let const_expr = consts::get_const_expr(cx, did, exp);
walk_expr(cx, const_expr, scope_stack, scope_map);
}
_ => {}
}
}

ast::ExprCast(ref sub_exp, _) |
ast::ExprAddrOf(_, ref sub_exp) |
Expand Down