expand: Keep the correct current expansion ID for eager expansions

Solve the problem of `ParentScope` entries for eager expansions not exising in the resolver map by creating them on demand.
rust-lang · Aug 21, 2019 · 96032aa · 96032aa
1 parent 1dd56aa
commit 96032aa
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/src/librustc_resolve/macros.rs b/src/librustc_resolve/macros.rs
@@ -142,7 +142,9 @@ impl<'a> base::Resolver for Resolver<'a> {
 
     fn resolve_macro_invocation(&mut self, invoc: &Invocation, invoc_id: ExpnId, force: bool)
                                 -> Result<Option<Lrc<SyntaxExtension>>, Indeterminate> {
-        let parent_scope = self.invocation_parent_scopes[&invoc_id];
+        let inherited_parent_scope = self.invocation_parent_scopes[&invoc_id];
+        let parent_scope = *self.invocation_parent_scopes.entry(invoc.expansion_data.id)
+                                                         .or_insert(inherited_parent_scope);
         let (path, kind, derives, after_derive) = match invoc.kind {
             InvocationKind::Attr { ref attr, ref derives, after_derive, .. } =>
                 (&attr.path, MacroKind::Attr, self.arenas.alloc_ast_paths(derives), after_derive),

diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs
@@ -318,7 +318,6 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
             progress = true;
             let ExpansionData { depth, id: expn_id, .. } = invoc.expansion_data;
             self.cx.current_expansion = invoc.expansion_data.clone();
-            self.cx.current_expansion.id = scope;
 
             // FIXME(jseyfried): Refactor out the following logic
             let (expanded_fragment, new_invocations) = if let Some(ext) = ext {

diff --git a/src/test/ui/hygiene/eager-from-opaque.stderr b/src/test/ui/hygiene/eager-from-opaque.stderr
@@ -3,6 +3,9 @@ error: cannot find macro `foo!` in this scope
    |
 LL |         foo!()
    |         ^^^
+...
+LL |     format_args!(bar!());
+   |                  ------ in this macro invocation
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/macros/derive-in-eager-expansion-hang.stderr b/src/test/ui/macros/derive-in-eager-expansion-hang.stderr
@@ -8,6 +8,9 @@ LL | |
 LL | |         ""
 LL | |     }
    | |_____^
+...
+LL |       format_args!(hang!());
+   |                    ------- in this macro invocation
 help: you might be missing a string literal to format with
    |
 LL |     format_args!("{}", hang!());