Skip to content

Commit 3d29f0e

Browse files
borsbors
committed
Auto merge of #44316 - eddyb:no-local-var-def-id, r=michaelwoerister
Use NodeId/HirId instead of DefId for local variables. r? @michaelwoerister
2 parents ca94c75 + da0a47a commit 3d29f0e

File tree

37 files changed

+200
-235
lines changed

37 files changed

+200
-235
lines changed

‎src/librustc/hir/def.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,9 @@ pub enum Def {
4848
VariantCtor(DefId, CtorKind),
4949
Method(DefId),
5050
AssociatedConst(DefId),
51-
Local(DefId),
52-
Upvar(DefId, // def id of closed over local
51+
52+
Local(ast::NodeId),
53+
Upvar(ast::NodeId, // node id of closed over local
5354
usize, // index in the freevars list of the closure
5455
ast::NodeId), // expr node that creates the closure
5556
Label(ast::NodeId),
@@ -150,11 +151,13 @@ impl Def {
150151
Def::Variant(id) | Def::VariantCtor(id, ..) | Def::Enum(id) | Def::TyAlias(id) |
151152
Def::AssociatedTy(id) | Def::TyParam(id) | Def::Struct(id) | Def::StructCtor(id, ..) |
152153
Def::Union(id) | Def::Trait(id) | Def::Method(id) | Def::Const(id) |
153-
Def::AssociatedConst(id) | Def::Local(id) | Def::Upvar(id, ..) | Def::Macro(id, ..) |
154+
Def::AssociatedConst(id) | Def::Macro(id, ..) |
154155
Def::GlobalAsm(id) => {
155156
id
156157
}
157158

159+
Def::Local(..) |
160+
Def::Upvar(..) |
158161
Def::Label(..) |
159162
Def::PrimTy(..) |
160163
Def::SelfTy(..) |

‎src/librustc/hir/intravisit.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -653,8 +653,8 @@ pub fn walk_pat<'v, V: Visitor<'v>>(visitor: &mut V, pattern: &'v Pat) {
653653
PatKind::Ref(ref subpattern, _) => {
654654
visitor.visit_pat(subpattern)
655655
}
656-
PatKind::Binding(_, def_id, ref pth1, ref optional_subpattern) => {
657-
visitor.visit_def_mention(Def::Local(def_id));
656+
PatKind::Binding(_, canonical_id, ref pth1, ref optional_subpattern) => {
657+
visitor.visit_def_mention(Def::Local(canonical_id));
658658
visitor.visit_name(pth1.span, pth1.node);
659659
walk_list!(visitor, visit_pat, optional_subpattern);
660660
}

‎src/librustc/hir/lowering.rs

Lines changed: 24 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@
4141
//! in the HIR, especially for multiple identifiers.
4242
4343
use hir;
44-
use hir::map::{Definitions, DefKey, REGULAR_SPACE};
45-
use hir::map::definitions::DefPathData;
44+
use hir::map::{Definitions, DefKey};
4645
use hir::def_id::{DefIndex, DefId, CRATE_DEF_INDEX};
4746
use hir::def::{Def, PathResolution};
4847
use lint::builtin::PARENTHESIZED_PARAMS_IN_TYPES_AND_MODULES;
@@ -1738,29 +1737,28 @@ impl<'a> LoweringContext<'a> {
17381737
node: match p.node {
17391738
PatKind::Wild => hir::PatKind::Wild,
17401739
PatKind::Ident(ref binding_mode, pth1, ref sub) => {
1741-
self.with_parent_def(p.id, |this| {
1742-
match this.resolver.get_resolution(p.id).map(|d| d.base_def()) {
1743-
// `None` can occur in body-less function signatures
1744-
def @ None | def @ Some(Def::Local(_)) => {
1745-
let def_id = def.map(|d| d.def_id()).unwrap_or_else(|| {
1746-
this.resolver.definitions().local_def_id(p.id)
1747-
});
1748-
hir::PatKind::Binding(this.lower_binding_mode(binding_mode),
1749-
def_id,
1750-
respan(pth1.span, pth1.node.name),
1751-
sub.as_ref().map(|x| this.lower_pat(x)))
1752-
}
1753-
Some(def) => {
1754-
hir::PatKind::Path(hir::QPath::Resolved(None, P(hir::Path {
1755-
span: pth1.span,
1756-
def,
1757-
segments: hir_vec![
1758-
hir::PathSegment::from_name(pth1.node.name)
1759-
],
1760-
})))
1761-
}
1740+
match self.resolver.get_resolution(p.id).map(|d| d.base_def()) {
1741+
// `None` can occur in body-less function signatures
1742+
def @ None | def @ Some(Def::Local(_)) => {
1743+
let canonical_id = match def {
1744+
Some(Def::Local(id)) => id,
1745+
_ => p.id
1746+
};
1747+
hir::PatKind::Binding(self.lower_binding_mode(binding_mode),
1748+
canonical_id,
1749+
respan(pth1.span, pth1.node.name),
1750+
sub.as_ref().map(|x| self.lower_pat(x)))
17621751
}
1763-
})
1752+
Some(def) => {
1753+
hir::PatKind::Path(hir::QPath::Resolved(None, P(hir::Path {
1754+
span: pth1.span,
1755+
def,
1756+
segments: hir_vec![
1757+
hir::PathSegment::from_name(pth1.node.name)
1758+
],
1759+
})))
1760+
}
1761+
}
17641762
}
17651763
PatKind::Lit(ref e) => hir::PatKind::Lit(P(self.lower_expr(e))),
17661764
PatKind::TupleStruct(ref path, ref pats, ddpos) => {
@@ -2715,14 +2713,9 @@ impl<'a> LoweringContext<'a> {
27152713
id: Name,
27162714
binding: NodeId,
27172715
attrs: ThinVec<Attribute>) -> hir::Expr {
2718-
let def = {
2719-
let defs = self.resolver.definitions();
2720-
Def::Local(defs.local_def_id(binding))
2721-
};
2722-
27232716
let expr_path = hir::ExprPath(hir::QPath::Resolved(None, P(hir::Path {
27242717
span,
2725-
def,
2718+
def: Def::Local(binding),
27262719
segments: hir_vec![hir::PathSegment::from_name(id)],
27272720
})));
27282721

@@ -2860,23 +2853,12 @@ impl<'a> LoweringContext<'a> {
28602853
fn pat_ident_binding_mode(&mut self, span: Span, name: Name, bm: hir::BindingAnnotation)
28612854
-> P<hir::Pat> {
28622855
let LoweredNodeId { node_id, hir_id } = self.next_id();
2863-
let parent_def = self.parent_def.unwrap();
2864-
let def_id = {
2865-
let defs = self.resolver.definitions();
2866-
let def_path_data = DefPathData::Binding(name.as_str());
2867-
let def_index = defs.create_def_with_parent(parent_def,
2868-
node_id,
2869-
def_path_data,
2870-
REGULAR_SPACE,
2871-
Mark::root());
2872-
DefId::local(def_index)
2873-
};
28742856

28752857
P(hir::Pat {
28762858
id: node_id,
28772859
hir_id,
28782860
node: hir::PatKind::Binding(bm,
2879-
def_id,
2861+
node_id,
28802862
Spanned {
28812863
span,
28822864
node: name,

‎src/librustc/hir/map/def_collector.rs

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -233,21 +233,10 @@ impl<'a> visit::Visitor<'a> for DefCollector<'a> {
233233
}
234234

235235
fn visit_pat(&mut self, pat: &'a Pat) {
236-
let parent_def = self.parent_def;
237-
238236
match pat.node {
239237
PatKind::Mac(..) => return self.visit_macro_invoc(pat.id, false),
240-
PatKind::Ident(_, id, _) => {
241-
let def = self.create_def(pat.id,
242-
DefPathData::Binding(id.node.name.as_str()),
243-
REGULAR_SPACE);
244-
self.parent_def = Some(def);
245-
}
246-
_ => {}
238+
_ => visit::walk_pat(self, pat),
247239
}
248-
249-
visit::walk_pat(self, pat);
250-
self.parent_def = parent_def;
251240
}
252241

253242
fn visit_expr(&mut self, expr: &'a Expr) {

‎src/librustc/hir/map/definitions.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,6 @@ impl DefKey {
212212
DefPathData::TypeParam(name) |
213213
DefPathData::LifetimeDef(name) |
214214
DefPathData::EnumVariant(name) |
215-
DefPathData::Binding(name) |
216215
DefPathData::Field(name) |
217216
DefPathData::GlobalMetaData(name) => {
218217
name.hash(&mut hasher);
@@ -372,8 +371,6 @@ pub enum DefPathData {
372371
StructCtor,
373372
/// Initializer for a const
374373
Initializer,
375-
/// Pattern binding
376-
Binding(InternedString),
377374
/// An `impl Trait` type node.
378375
ImplTrait,
379376
/// A `typeof` type node.
@@ -613,7 +610,6 @@ impl DefPathData {
613610
TypeParam(name) |
614611
LifetimeDef(name) |
615612
EnumVariant(name) |
616-
Binding(name) |
617613
Field(name) |
618614
GlobalMetaData(name) => Some(name),
619615

@@ -638,7 +634,6 @@ impl DefPathData {
638634
TypeParam(name) |
639635
LifetimeDef(name) |
640636
EnumVariant(name) |
641-
Binding(name) |
642637
Field(name) |
643638
GlobalMetaData(name) => {
644639
return name

‎src/librustc/hir/mod.rs

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -623,8 +623,10 @@ pub enum PatKind {
623623
Wild,
624624

625625
/// A fresh binding `ref mut binding @ OPT_SUBPATTERN`.
626-
/// The `DefId` is for the definition of the variable being bound.
627-
Binding(BindingAnnotation, DefId, Spanned<Name>, Option<P<Pat>>),
626+
/// The `NodeId` is the canonical ID for the variable being bound,
627+
/// e.g. in `Ok(x) | Err(x)`, both `x` use the same canonical ID,
628+
/// which is the pattern ID of the first `x`.
629+
Binding(BindingAnnotation, NodeId, Spanned<Name>, Option<P<Pat>>),
628630

629631
/// A struct or struct variant pattern, e.g. `Variant {x, y, ..}`.
630632
/// The `bool` is `true` in the presence of a `..`.
@@ -1843,6 +1845,15 @@ pub struct Freevar {
18431845
pub span: Span
18441846
}
18451847

1848+
impl Freevar {
1849+
pub fn var_id(&self) -> NodeId {
1850+
match self.def {
1851+
Def::Local(id) | Def::Upvar(id, ..) => id,
1852+
_ => bug!("Freevar::var_id: bad def ({:?})", self.def)
1853+
}
1854+
}
1855+
}
1856+
18461857
pub type FreevarMap = NodeMap<Vec<Freevar>>;
18471858

18481859
pub type CaptureModeMap = NodeMap<CaptureClause>;

‎src/librustc/infer/error_reporting/mod.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -913,8 +913,9 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
913913
name)
914914
}
915915
infer::UpvarRegion(ref upvar_id, _) => {
916-
format!(" for capture of `{}` by closure",
917-
self.tcx.local_var_name_str_def_index(upvar_id.var_id))
916+
let var_node_id = self.tcx.hir.hir_to_node_id(upvar_id.var_id);
917+
let var_name = self.tcx.hir.name(var_node_id);
918+
format!(" for capture of `{}` by closure", var_name)
918919
}
919920
};
920921

‎src/librustc/infer/error_reporting/note.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
4343
"...so that reference does not outlive borrowed content");
4444
}
4545
infer::ReborrowUpvar(span, ref upvar_id) => {
46+
let var_node_id = self.tcx.hir.hir_to_node_id(upvar_id.var_id);
47+
let var_name = self.tcx.hir.name(var_node_id);
4648
err.span_note(span,
47-
&format!("...so that closure can access `{}`",
48-
self.tcx
49-
.local_var_name_str_def_index(upvar_id.var_id)));
49+
&format!("...so that closure can access `{}`", var_name));
5050
}
5151
infer::InfStackClosure(span) => {
5252
err.span_note(span, "...so that closure does not outlive its stack frame");
@@ -63,7 +63,7 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
6363
err.span_note(span,
6464
&format!("...so that captured variable `{}` does not outlive the \
6565
enclosing closure",
66-
self.tcx.local_var_name_str(id)));
66+
self.tcx.hir.name(id)));
6767
}
6868
infer::IndexSlice(span) => {
6969
err.span_note(span, "...so that slice is not indexed outside the lifetime");
@@ -176,22 +176,22 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
176176
err
177177
}
178178
infer::ReborrowUpvar(span, ref upvar_id) => {
179+
let var_node_id = self.tcx.hir.hir_to_node_id(upvar_id.var_id);
180+
let var_name = self.tcx.hir.name(var_node_id);
179181
let mut err = struct_span_err!(self.tcx.sess,
180182
span,
181183
E0313,
182184
"lifetime of borrowed pointer outlives lifetime \
183185
of captured variable `{}`...",
184-
self.tcx
185-
.local_var_name_str_def_index(upvar_id.var_id));
186+
var_name);
186187
self.tcx.note_and_explain_region(region_scope_tree, &mut err,
187188
"...the borrowed pointer is valid for ",
188189
sub,
189190
"...");
190191
self.tcx.note_and_explain_region(
191192
region_scope_tree,
192193
&mut err,
193-
&format!("...but `{}` is only valid for ",
194-
self.tcx.local_var_name_str_def_index(upvar_id.var_id)),
194+
&format!("...but `{}` is only valid for ", var_name),
195195
sup,
196196
"");
197197
err
@@ -234,7 +234,7 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
234234
E0474,
235235
"captured variable `{}` does not outlive the \
236236
enclosing closure",
237-
self.tcx.local_var_name_str(id));
237+
self.tcx.hir.name(id));
238238
self.tcx.note_and_explain_region(region_scope_tree, &mut err,
239239
"captured variable is valid for ", sup, "");
240240
self.tcx.note_and_explain_region(region_scope_tree, &mut err,

‎src/librustc/middle/dead.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ impl<'a, 'tcx> MarkSymbolVisitor<'a, 'tcx> {
7979
self.check_def_id(def.def_id());
8080
}
8181
_ if self.ignore_non_const_paths => (),
82-
Def::PrimTy(..) | Def::SelfTy(..) => (),
82+
Def::PrimTy(..) | Def::SelfTy(..) |
83+
Def::Local(..) | Def::Upvar(..) => {}
8384
Def::Variant(variant_id) | Def::VariantCtor(variant_id, ..) => {
8485
if let Some(enum_id) = self.tcx.parent_def_id(variant_id) {
8586
self.check_def_id(enum_id);

‎src/librustc/middle/expr_use_visitor.rs

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -828,7 +828,7 @@ impl<'a, 'gcx, 'tcx> ExprUseVisitor<'a, 'gcx, 'tcx> {
828828

829829
let ExprUseVisitor { ref mc, ref mut delegate, param_env } = *self;
830830
return_if_err!(mc.cat_pattern(cmt_discr.clone(), pat, |cmt_pat, pat| {
831-
if let PatKind::Binding(_, def_id, ..) = pat.node {
831+
if let PatKind::Binding(_, canonical_id, ..) = pat.node {
832832
debug!("binding cmt_pat={:?} pat={:?} match_mode={:?}", cmt_pat, pat, match_mode);
833833
let bm = *mc.tables.pat_binding_modes().get(pat.hir_id)
834834
.expect("missing binding mode");
@@ -838,7 +838,7 @@ impl<'a, 'gcx, 'tcx> ExprUseVisitor<'a, 'gcx, 'tcx> {
838838

839839
// Each match binding is effectively an assignment to the
840840
// binding being produced.
841-
let def = Def::Local(def_id);
841+
let def = Def::Local(canonical_id);
842842
if let Ok(binding_cmt) = mc.cat_def(pat.id, pat.span, pat_ty, def) {
843843
delegate.mutate(pat.id, pat.span, binding_cmt, MutateMode::Init);
844844
}
@@ -895,17 +895,16 @@ impl<'a, 'gcx, 'tcx> ExprUseVisitor<'a, 'gcx, 'tcx> {
895895

896896
self.tcx().with_freevars(closure_expr.id, |freevars| {
897897
for freevar in freevars {
898-
let var_def_id = freevar.def.def_id();
899-
debug_assert!(var_def_id.is_local());
898+
let var_hir_id = self.tcx().hir.node_to_hir_id(freevar.var_id());
900899
let closure_def_id = self.tcx().hir.local_def_id(closure_expr.id);
901900
let upvar_id = ty::UpvarId {
902-
var_id: var_def_id.index,
901+
var_id: var_hir_id,
903902
closure_expr_id: closure_def_id.index
904903
};
905904
let upvar_capture = self.mc.tables.upvar_capture(upvar_id);
906905
let cmt_var = return_if_err!(self.cat_captured_var(closure_expr.id,
907906
fn_decl_span,
908-
freevar.def));
907+
freevar));
909908
match upvar_capture {
910909
ty::UpvarCapture::ByValue => {
911910
let mode = copy_or_move(&self.mc,
@@ -930,14 +929,13 @@ impl<'a, 'gcx, 'tcx> ExprUseVisitor<'a, 'gcx, 'tcx> {
930929
fn cat_captured_var(&mut self,
931930
closure_id: ast::NodeId,
932931
closure_span: Span,
933-
upvar_def: Def)
932+
upvar: &hir::Freevar)
934933
-> mc::McResult<mc::cmt<'tcx>> {
935934
// Create the cmt for the variable being borrowed, from the
936935
// caller's perspective
937-
let var_node_id = self.tcx().hir.as_local_node_id(upvar_def.def_id()).unwrap();
938-
let var_hir_id = self.tcx().hir.node_to_hir_id(var_node_id);
936+
let var_hir_id = self.tcx().hir.node_to_hir_id(upvar.var_id());
939937
let var_ty = self.mc.node_ty(var_hir_id)?;
940-
self.mc.cat_def(closure_id, closure_span, var_ty, upvar_def)
938+
self.mc.cat_def(closure_id, closure_span, var_ty, upvar.def)
941939
}
942940
}
943941

‎src/librustc/middle/liveness.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -429,8 +429,7 @@ fn visit_expr<'a, 'tcx>(ir: &mut IrMaps<'a, 'tcx>, expr: &'tcx Expr) {
429429
let mut call_caps = Vec::new();
430430
ir.tcx.with_freevars(expr.id, |freevars| {
431431
for fv in freevars {
432-
if let Def::Local(def_id) = fv.def {
433-
let rv = ir.tcx.hir.as_local_node_id(def_id).unwrap();
432+
if let Def::Local(rv) = fv.def {
434433
let fv_ln = ir.add_live_node(FreeVarNode(fv.span));
435434
call_caps.push(CaptureInfo {ln: fv_ln,
436435
var_nid: rv});
@@ -1238,8 +1237,7 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {
12381237
fn access_path(&mut self, id: NodeId, path: &hir::Path, succ: LiveNode, acc: u32)
12391238
-> LiveNode {
12401239
match path.def {
1241-
Def::Local(def_id) => {
1242-
let nid = self.ir.tcx.hir.as_local_node_id(def_id).unwrap();
1240+
Def::Local(nid) => {
12431241
self.access_var(id, nid, succ, acc, path.span)
12441242
}
12451243
_ => succ
@@ -1414,12 +1412,11 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {
14141412
fn check_lvalue(&mut self, expr: &'tcx Expr) {
14151413
match expr.node {
14161414
hir::ExprPath(hir::QPath::Resolved(_, ref path)) => {
1417-
if let Def::Local(def_id) = path.def {
1415+
if let Def::Local(nid) = path.def {
14181416
// Assignment to an immutable variable or argument: only legal
14191417
// if there is no later assignment. If this local is actually
14201418
// mutable, then check for a reassignment to flag the mutability
14211419
// as being used.
1422-
let nid = self.ir.tcx.hir.as_local_node_id(def_id).unwrap();
14231420
let ln = self.live_node(expr.id, expr.span);
14241421
let var = self.variable(nid, expr.span);
14251422
self.warn_about_dead_assign(expr.span, expr.id, ln, var);

0 commit comments

Comments
 (0)