From: Matthew Jasper <mjjasper1@gmail.com>
Date: Fri, 19 May 2023 10:21:27 +0000 (+0100)
Subject: gccrs: Fix macro resolutions in middle of multiple nested macro_use modules
X-Git-Tag: basepoints/gcc-15~2526
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1af4d0e6078e048b88aa5e1547cf1e097952b621;p=thirdparty%2Fgcc.git

gccrs: Fix macro resolutions in middle of multiple nested macro_use modules

gcc/rust/ChangeLog:

	* resolve/rust-early-name-resolver.cc (EarlyNameResolver::accumulate_escaped_macros):
	Remove unnecessary visit.

gcc/testsuite/ChangeLog:

	* rust/compile/nested_macro_use3.rs: New test.

Signed-off-by: Matthew Jasper <mjjasper1@gmail.com>
---

diff --git a/gcc/rust/resolve/rust-early-name-resolver.cc b/gcc/rust/resolve/rust-early-name-resolver.cc
index 2514a2ac3d37..259b2d41fad6 100644
--- a/gcc/rust/resolve/rust-early-name-resolver.cc
+++ b/gcc/rust/resolve/rust-early-name-resolver.cc
@@ -63,8 +63,6 @@ EarlyNameResolver::accumulate_escaped_macros (AST::Module &module)
 	    continue;
 	  }
 
-	item->accept_vis (*this);
-
 	if (item->get_ast_kind () == AST::Kind::MACRO_RULES_DEFINITION)
 	  escaped_macros.emplace_back (item->clone_item ());
       }
diff --git a/gcc/testsuite/rust/compile/nested_macro_use3.rs b/gcc/testsuite/rust/compile/nested_macro_use3.rs
new file mode 100644
index 000000000000..751833313c91
--- /dev/null
+++ b/gcc/testsuite/rust/compile/nested_macro_use3.rs
@@ -0,0 +1,16 @@
+#[macro_use]
+mod num {
+    #[macro_use]
+    mod macros {
+        macro_rules! a {
+            () => ()
+        }
+    }
+
+    a!();
+}
+
+fn main() -> i32 { 
+    a!();
+    0
+}