From 3d95d179373c08d5f26d014f35a76e06e18c41ed Mon Sep 17 00:00:00 2001
From: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Date: Mon, 19 Aug 2019 23:35:25 +0300
Subject: 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.
---
 src/libsyntax/ext/expand.rs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/libsyntax')

diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs
index 9a3195b1165..cf1ae3e3164 100644
--- a/src/libsyntax/ext/expand.rs
+++ b/src/libsyntax/ext/expand.rs
@@ -331,7 +331,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 {
-- 
cgit 1.4.1-3-g733a5


From f2e303185962583c2972f040547607a155a88841 Mon Sep 17 00:00:00 2001
From: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Date: Sat, 24 Aug 2019 18:28:58 +0300
Subject: expand: Do not do questionable span adjustment before eagerly
 expanding an expression

Maybe it made sense when it was introduced, but now it's doing something incorrect.
---
 src/libsyntax/ext/base.rs                    |  3 ---
 src/test/ui/hygiene/eager-from-opaque.rs     |  4 +++-
 src/test/ui/hygiene/eager-from-opaque.stderr | 11 -----------
 3 files changed, 3 insertions(+), 15 deletions(-)
 delete mode 100644 src/test/ui/hygiene/eager-from-opaque.stderr

(limited to 'src/libsyntax')

diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs
index 7f4feff6be6..50ae052b4b7 100644
--- a/src/libsyntax/ext/base.rs
+++ b/src/libsyntax/ext/base.rs
@@ -944,9 +944,6 @@ pub fn expr_to_spanned_string<'a>(
     mut expr: P<ast::Expr>,
     err_msg: &str,
 ) -> Result<Spanned<(Symbol, ast::StrStyle)>, Option<DiagnosticBuilder<'a>>> {
-    // Update `expr.span`'s ctxt now in case expr is an `include!` macro invocation.
-    expr.span = expr.span.apply_mark(cx.current_expansion.id);
-
     // we want to be able to handle e.g., `concat!("foo", "bar")`
     cx.expander().visit_expr(&mut expr);
     Err(match expr.node {
diff --git a/src/test/ui/hygiene/eager-from-opaque.rs b/src/test/ui/hygiene/eager-from-opaque.rs
index 57925d626b9..6f3215dd697 100644
--- a/src/test/ui/hygiene/eager-from-opaque.rs
+++ b/src/test/ui/hygiene/eager-from-opaque.rs
@@ -1,6 +1,8 @@
 // Opaque macro can eagerly expand its input without breaking its resolution.
 // Regression test for issue #63685.
 
+// check-pass
+
 macro_rules! foo {
     () => {
         "foo"
@@ -9,7 +11,7 @@ macro_rules! foo {
 
 macro_rules! bar {
     () => {
-        foo!() //~ ERROR cannot find macro `foo!` in this scope
+        foo!()
     };
 }
 
diff --git a/src/test/ui/hygiene/eager-from-opaque.stderr b/src/test/ui/hygiene/eager-from-opaque.stderr
deleted file mode 100644
index f696e6caff7..00000000000
--- a/src/test/ui/hygiene/eager-from-opaque.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error: cannot find macro `foo!` in this scope
-  --> $DIR/eager-from-opaque.rs:12:9
-   |
-LL |         foo!()
-   |         ^^^
-...
-LL |     format_args!(bar!());
-   |                  ------ in this macro invocation
-
-error: aborting due to previous error
-
-- 
cgit 1.4.1-3-g733a5