diff options
| -rw-r--r-- | compiler/rustc_ast_lowering/src/block.rs | 9 | ||||
| -rw-r--r-- | compiler/rustc_ast_lowering/src/delegation.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_ast_lowering/src/expr.rs | 14 | ||||
| -rw-r--r-- | compiler/rustc_ast_lowering/src/item.rs | 12 | ||||
| -rw-r--r-- | compiler/rustc_ast_lowering/src/lib.rs | 35 | ||||
| -rw-r--r-- | compiler/rustc_ast_lowering/src/pat.rs | 4 |
6 files changed, 38 insertions, 38 deletions
diff --git a/compiler/rustc_ast_lowering/src/block.rs b/compiler/rustc_ast_lowering/src/block.rs index 8e02cbfd2ca..20d3ce65fac 100644 --- a/compiler/rustc_ast_lowering/src/block.rs +++ b/compiler/rustc_ast_lowering/src/block.rs @@ -14,15 +14,6 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> { self.arena.alloc(self.lower_block_noalloc(hir_id, b, targeted_by_break)) } - pub(super) fn lower_block_with_hir_id( - &mut self, - b: &Block, - hir_id: hir::HirId, - targeted_by_break: bool, - ) -> &'hir hir::Block<'hir> { - self.arena.alloc(self.lower_block_noalloc(hir_id, b, targeted_by_break)) - } - pub(super) fn lower_block_noalloc( &mut self, hir_id: hir::HirId, diff --git a/compiler/rustc_ast_lowering/src/delegation.rs b/compiler/rustc_ast_lowering/src/delegation.rs index 37eea707929..70c94f4019a 100644 --- a/compiler/rustc_ast_lowering/src/delegation.rs +++ b/compiler/rustc_ast_lowering/src/delegation.rs @@ -260,7 +260,7 @@ impl<'hir> LoweringContext<'_, 'hir> { }; self_resolver.visit_block(block); // Target expr needs to lower `self` path. - this.ident_to_local_id.insert(pat_node_id, param.pat.hir_id.local_id); + this.ident_and_label_to_local_id.insert(pat_node_id, param.pat.hir_id.local_id); this.lower_target_expr(&block) } else { this.generate_arg(param.pat.hir_id, span) diff --git a/compiler/rustc_ast_lowering/src/expr.rs b/compiler/rustc_ast_lowering/src/expr.rs index 3df945a18e8..d986c4b412f 100644 --- a/compiler/rustc_ast_lowering/src/expr.rs +++ b/compiler/rustc_ast_lowering/src/expr.rs @@ -261,10 +261,12 @@ impl<'hir> LoweringContext<'_, 'hir> { // expr node id. let block_hir_id = self.lower_node_id(blk.id); let opt_label = self.lower_label(*opt_label, blk.id, block_hir_id); - hir::ExprKind::Block( - self.lower_block_with_hir_id(blk, block_hir_id, opt_label.is_some()), - opt_label, - ) + let hir_block = self.arena.alloc(self.lower_block_noalloc( + block_hir_id, + blk, + opt_label.is_some(), + )); + hir::ExprKind::Block(hir_block, opt_label) } ExprKind::Assign(el, er, span) => self.lower_expr_assign(el, er, *span, e.span), ExprKind::AssignOp(op, el, er) => hir::ExprKind::AssignOp( @@ -1486,7 +1488,7 @@ impl<'hir> LoweringContext<'_, 'hir> { dest_hir_id: hir::HirId, ) -> Option<Label> { let label = opt_label?; - self.labelled_node_id_to_local_id.insert(dest_id, dest_hir_id.local_id); + self.ident_and_label_to_local_id.insert(dest_id, dest_hir_id.local_id); Some(Label { ident: self.lower_ident(label.ident) }) } @@ -1494,7 +1496,7 @@ impl<'hir> LoweringContext<'_, 'hir> { let target_id = match destination { Some((id, _)) => { if let Some(loop_id) = self.resolver.get_label_res(id) { - let local_id = self.labelled_node_id_to_local_id[&loop_id]; + let local_id = self.ident_and_label_to_local_id[&loop_id]; let loop_hir_id = HirId { owner: self.current_hir_id_owner, local_id }; Ok(loop_hir_id) } else { diff --git a/compiler/rustc_ast_lowering/src/item.rs b/compiler/rustc_ast_lowering/src/item.rs index 9cad03ae403..d7245607501 100644 --- a/compiler/rustc_ast_lowering/src/item.rs +++ b/compiler/rustc_ast_lowering/src/item.rs @@ -154,8 +154,7 @@ impl<'hir> LoweringContext<'_, 'hir> { fn lower_item(&mut self, i: &Item) -> &'hir hir::Item<'hir> { let mut ident = i.ident; let vis_span = self.lower_span(i.vis.span); - let hir_id = - hir::HirId { owner: self.current_hir_id_owner, local_id: hir::ItemLocalId::ZERO }; + let hir_id = hir::HirId::make_owner(self.current_hir_id_owner.def_id); let attrs = self.lower_attrs(hir_id, &i.attrs); let kind = self.lower_item_kind(i.span, i.id, hir_id, &mut ident, attrs, vis_span, &i.kind); let item = hir::Item { @@ -605,8 +604,7 @@ impl<'hir> LoweringContext<'_, 'hir> { } fn lower_foreign_item(&mut self, i: &ForeignItem) -> &'hir hir::ForeignItem<'hir> { - let hir_id = - hir::HirId { owner: self.current_hir_id_owner, local_id: hir::ItemLocalId::ZERO }; + let hir_id = hir::HirId::make_owner(self.current_hir_id_owner.def_id); let owner_id = hir_id.expect_owner(); self.lower_attrs(hir_id, &i.attrs); let item = hir::ForeignItem { @@ -730,8 +728,7 @@ impl<'hir> LoweringContext<'_, 'hir> { } fn lower_trait_item(&mut self, i: &AssocItem) -> &'hir hir::TraitItem<'hir> { - let hir_id = - hir::HirId { owner: self.current_hir_id_owner, local_id: hir::ItemLocalId::ZERO }; + let hir_id = hir::HirId::make_owner(self.current_hir_id_owner.def_id); self.lower_attrs(hir_id, &i.attrs); let trait_item_def_id = hir_id.expect_owner(); @@ -861,8 +858,7 @@ impl<'hir> LoweringContext<'_, 'hir> { // Since `default impl` is not yet implemented, this is always true in impls. let has_value = true; let (defaultness, _) = self.lower_defaultness(i.kind.defaultness(), has_value); - let hir_id = - hir::HirId { owner: self.current_hir_id_owner, local_id: hir::ItemLocalId::ZERO }; + let hir_id = hir::HirId::make_owner(self.current_hir_id_owner.def_id); self.lower_attrs(hir_id, &i.attrs); let (generics, kind) = match &i.kind { diff --git a/compiler/rustc_ast_lowering/src/lib.rs b/compiler/rustc_ast_lowering/src/lib.rs index 3067cb7ccf2..4ca878a1be0 100644 --- a/compiler/rustc_ast_lowering/src/lib.rs +++ b/compiler/rustc_ast_lowering/src/lib.rs @@ -138,10 +138,10 @@ struct LoweringContext<'a, 'hir> { impl_trait_defs: Vec<hir::GenericParam<'hir>>, impl_trait_bounds: Vec<hir::WherePredicate<'hir>>, - /// NodeIds of labelled nodes that are lowered inside the current HIR owner. - labelled_node_id_to_local_id: NodeMap<hir::ItemLocalId>, - /// NodeIds of identifier that are lowered inside the current HIR owner. - ident_to_local_id: NodeMap<hir::ItemLocalId>, + /// NodeIds of pattern identifiers and labelled nodes that are lowered inside the current HIR owner. + ident_and_label_to_local_id: NodeMap<hir::ItemLocalId>, + /// NodeIds that are lowered inside the current HIR owner. Only used for duplicate lowering check. + node_id_to_local_id: NodeMap<hir::ItemLocalId>, allow_try_trait: Lrc<[Symbol]>, allow_gen_future: Lrc<[Symbol]>, @@ -171,8 +171,8 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> { current_hir_id_owner: hir::CRATE_OWNER_ID, current_def_id_parent: CRATE_DEF_ID, item_local_id_counter: hir::ItemLocalId::ZERO, - labelled_node_id_to_local_id: Default::default(), - ident_to_local_id: Default::default(), + ident_and_label_to_local_id: Default::default(), + node_id_to_local_id: Default::default(), trait_map: Default::default(), // Lowering state. @@ -589,9 +589,9 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> { let current_attrs = std::mem::take(&mut self.attrs); let current_bodies = std::mem::take(&mut self.bodies); - let current_labelled_node_id_to_local_id = - std::mem::take(&mut self.labelled_node_id_to_local_id); - let current_ident_to_local_id = std::mem::take(&mut self.ident_to_local_id); + let current_ident_and_label_to_local_id = + std::mem::take(&mut self.ident_and_label_to_local_id); + let current_node_id_to_local_id = std::mem::take(&mut self.node_id_to_local_id); let current_trait_map = std::mem::take(&mut self.trait_map); let current_owner = std::mem::replace(&mut self.current_hir_id_owner, hir::OwnerId { def_id }); @@ -604,6 +604,10 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> { // we want `f` to be able to refer to the `LocalDefId`s that the caller created. // and the caller to refer to some of the subdefinitions' nodes' `LocalDefId`s. + // Always allocate the first `HirId` for the owner itself. + let _old = self.node_id_to_local_id.insert(owner, hir::ItemLocalId::ZERO); + debug_assert_eq!(_old, None); + let item = self.with_def_id_parent(def_id, f); debug_assert_eq!(def_id, item.def_id().def_id); // `f` should have consumed all the elements in these vectors when constructing `item`. @@ -613,8 +617,8 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> { self.attrs = current_attrs; self.bodies = current_bodies; - self.labelled_node_id_to_local_id = current_labelled_node_id_to_local_id; - self.ident_to_local_id = current_ident_to_local_id; + self.ident_and_label_to_local_id = current_ident_and_label_to_local_id; + self.node_id_to_local_id = current_node_id_to_local_id; self.trait_map = current_trait_map; self.current_hir_id_owner = current_owner; self.item_local_id_counter = current_local_counter; @@ -703,6 +707,13 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> { self.trait_map.insert(hir_id.local_id, traits.into_boxed_slice()); } + // Check whether the same `NodeId` is lowered more than once. + #[cfg(debug_assertions)] + { + let old = self.node_id_to_local_id.insert(ast_node_id, local_id); + assert_eq!(old, None); + } + hir_id } @@ -720,7 +731,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> { fn lower_res(&mut self, res: Res<NodeId>) -> Res { let res: Result<Res, ()> = res.apply_id(|id| { let owner = self.current_hir_id_owner; - let local_id = self.ident_to_local_id.get(&id).copied().ok_or(())?; + let local_id = self.ident_and_label_to_local_id.get(&id).copied().ok_or(())?; Ok(HirId { owner, local_id }) }); trace!(?res); diff --git a/compiler/rustc_ast_lowering/src/pat.rs b/compiler/rustc_ast_lowering/src/pat.rs index 21829ea25a9..59c0e24479a 100644 --- a/compiler/rustc_ast_lowering/src/pat.rs +++ b/compiler/rustc_ast_lowering/src/pat.rs @@ -270,12 +270,12 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> { }; // All identifiers resolves to this canonical identifier share its `HirId`. let binding_id = if canonical_id == p.id { - self.ident_to_local_id.insert(canonical_id, hir_id.local_id); + self.ident_and_label_to_local_id.insert(canonical_id, hir_id.local_id); hir_id } else { hir::HirId { owner: self.current_hir_id_owner, - local_id: self.ident_to_local_id[&canonical_id], + local_id: self.ident_and_label_to_local_id[&canonical_id], } }; hir::PatKind::Binding( |