[COMMITTED 096/141] gccrs: Fix expansion of macros inside modules

[arthur . cohen]

From: Owen Avery <powerboat9.ga...@gmail.com>

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>
---
 gcc/rust/expand/rust-expand-visitor.cc                |  6 ++++++
 gcc/rust/expand/rust-expand-visitor.h                 |  1 +
 .../rust/compile/macros/mbe/macro-expand-module.rs    | 11 +++++++++++
 3 files changed, 18 insertions(+)
 create mode 100644 gcc/testsuite/rust/compile/macros/mbe/macro-expand-module.rs

diff --git a/gcc/rust/expand/rust-expand-visitor.cc 
b/gcc/rust/expand/rust-expand-visitor.cc
index 8ba9a15fddf..2830d200f72 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 5fc1011e001..ad237c07c2f 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 00000000000..e3e702eac84
--- /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) {}
-- 
2.45.2