From 59f1ccd35ca57da4cef5740d61ecfe5ea52939d7 Mon Sep 17 00:00:00 2001
From: Camille GILLOT <gillot.camille@gmail.com>
Date: Sun, 27 Dec 2020 17:57:17 +0100
Subject: [PATCH] Compute parent module when collecting hir::MacroDef.
---
.../rustc_middle/src/hir/map/collector.rs | 23 +++++++++++++------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/compiler/rustc_middle/src/hir/map/collector.rs b/compiler/rustc_middle/src/hir/map/collector.rs
index 82cfca4f171..872fcb0f581 100644
--- a/compiler/rustc_middle/src/hir/map/collector.rs
+++ b/compiler/rustc_middle/src/hir/map/collector.rs
@@ -529,13 +529,22 @@ impl<'a, 'hir> Visitor<'hir> for NodeCollector<'a, 'hir> {
}
fn visit_macro_def(&mut self, macro_def: &'hir MacroDef<'hir>) {
- self.with_dep_node_owner(macro_def.hir_id.owner, macro_def, |this, hash| {
- this.insert_with_hash(
- macro_def.span,
- macro_def.hir_id,
- Node::MacroDef(macro_def),
- hash,
- );
+ // Exported macros are visited directly from the crate root,
+ // so they do not have `parent_node` set.
+ // Find the correct enclosing module from their DefKey.
+ let def_key = self.definitions.def_key(macro_def.hir_id.owner);
+ let parent = def_key.parent.map_or(hir::CRATE_HIR_ID, |local_def_index| {
+ self.definitions.local_def_id_to_hir_id(LocalDefId { local_def_index })
+ });
+ self.with_parent(parent, |this| {
+ this.with_dep_node_owner(macro_def.hir_id.owner, macro_def, |this, hash| {
+ this.insert_with_hash(
+ macro_def.span,
+ macro_def.hir_id,
+ Node::MacroDef(macro_def),
+ hash,
+ );
+ })
});
}