[gcc/devel/rust/master] Fix expansion of macros inside modules

[Thomas Schwinge via Gcc-cvs]

https://gcc.gnu.org/g:c3a707ae42bb15b84924d93ea99b040b190b21b1

commit c3a707ae42bb15b84924d93ea99b040b190b21b1
Author: Owen Avery <powerboat9.ga...@gmail.com>
Date:   Fri Feb 21 19:07:59 2025 -0500

    Fix expansion of macros inside modules
    
    gcc/rust/ChangeLog:
    
            * expand/rust-expand-visitor.cc
            (ExpandVisitor::visit): Override DefaultASTVisitor in order to
            expand a module's items, rather than directly visit them.
            * expand/rust-expand-visitor.h
            (ExpandVisitor::visit): Add override.
    
    gcc/testsuite/ChangeLog:
    
            * rust/compile/macros/mbe/macro-expand-module.rs: New test.
    
    Signed-off-by: Owen Avery <powerboat9.ga...@gmail.com>

Diff:
---
 gcc/rust/expand/rust-expand-visitor.cc                       |  6 ++++++
 gcc/rust/expand/rust-expand-visitor.h                        |  1 +
 gcc/testsuite/rust/compile/macros/mbe/macro-expand-module.rs | 11 +++++++++++
 3 files changed, 18 insertions(+)

diff --git a/gcc/rust/expand/rust-expand-visitor.cc 
b/gcc/rust/expand/rust-expand-visitor.cc
index d1886cab3ba6..b3a53c11f09e 100644
--- a/gcc/rust/expand/rust-expand-visitor.cc
+++ b/gcc/rust/expand/rust-expand-visitor.cc
@@ -721,6 +721,12 @@ ExpandVisitor::visit (AST::TypeBoundWhereClauseItem &item)
     visit (bound);
 }
 
+void
+ExpandVisitor::visit (AST::Module &module)
+{
+  expand_inner_items (module.get_items ());
+}
+
 void
 ExpandVisitor::visit (AST::ExternCrate &crate)
 {}
diff --git a/gcc/rust/expand/rust-expand-visitor.h 
b/gcc/rust/expand/rust-expand-visitor.h
index c353689b2c52..131d62f52270 100644
--- a/gcc/rust/expand/rust-expand-visitor.h
+++ b/gcc/rust/expand/rust-expand-visitor.h
@@ -237,6 +237,7 @@ public:
   void visit (AST::TypeParam &param) override;
   void visit (AST::LifetimeWhereClauseItem &) override;
   void visit (AST::TypeBoundWhereClauseItem &item) override;
+  void visit (AST::Module &module) override;
   void visit (AST::ExternCrate &crate) override;
   void visit (AST::UseTreeGlob &) override;
   void visit (AST::UseTreeList &) override;
diff --git a/gcc/testsuite/rust/compile/macros/mbe/macro-expand-module.rs 
b/gcc/testsuite/rust/compile/macros/mbe/macro-expand-module.rs
new file mode 100644
index 000000000000..e3e702eac84e
--- /dev/null
+++ b/gcc/testsuite/rust/compile/macros/mbe/macro-expand-module.rs
@@ -0,0 +1,11 @@
+mod foo {
+    macro_rules! bar {
+        () => ()
+    }
+
+    bar! ();
+
+    pub struct S;
+}
+
+pub fn buzz(_: foo::S) {}