bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Store macro parent module in ExpnData.

Browse source
This commit is contained in:
Camille GILLOT 2021-06-28 19:29:55 +02:00
parent 969a6c2481
commit 3162c37b59
7 changed files with 32 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/rustc_middle/src/ty/mod.rs
View file

@ -1902,13 +1902,11 @@ impl<'tcx> TyCtxt<'tcx> {
scope: DefId,
block: hir::HirId,
) -> (Ident, DefId) {
let scope =
match ident.span.normalize_to_macros_2_0_and_adjust(self.expn_that_defined(scope)) {
Some(actual_expansion) => {
self.hir().definitions().parent_module_of_macro_def(actual_expansion)
}
None => self.parent_module(block).to_def_id(),
};
let scope = ident
.span
.normalize_to_macros_2_0_and_adjust(self.expn_that_defined(scope))
.and_then(|actual_expansion| actual_expansion.expn_data().parent_module)
.unwrap_or_else(|| self.parent_module(block).to_def_id());
(ident, scope)
}