From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <tschwinge@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1643)
	id 1F48E3858419; Mon, 26 Sep 2022 11:04:21 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1F48E3858419
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org;
	s=default; t=1664190261;
	bh=BT9Ie+7C+a4YThSzywHgX4f+UZGN4le3TyrmoZ8mDEI=;
	h=From:To:Subject:Date:From;
	b=T9x94a+AVtyB6wVSonjLKQkTuR8Y5+Sp6pd6sM5bpxwvNRBx442zCu7COnytPi8AO
	 uN5evhfeZYhhX/e04s6G+2hP0++GNmaaL0Q5RoOv7RXh44emjs1rn1cH9/db7jLIP3
	 kclaFrRs1vxckSLepYmWNWw6Y+I1RT4w8Tu3s5Lg=
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Thomas Schwinge <tschwinge@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc/devel/rust/master] module lowering: Do not append null pointers
 as items
X-Act-Checkin: gcc
X-Git-Author: Arthur Cohen <arthur.cohen@embecosm.com>
X-Git-Refname: refs/heads/devel/rust/master
X-Git-Oldrev: f252b4093666cf1e3d948b22f00fc12bf283a83f
X-Git-Newrev: d4da06f721577d3eaf2e21d6c6735d32a69d6ac7
Message-Id: <20220926110421.1F48E3858419@sourceware.org>
Date: Mon, 26 Sep 2022 11:04:21 +0000 (GMT)
List-Id: <gcc-cvs.sourceware.org>

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

commit d4da06f721577d3eaf2e21d6c6735d32a69d6ac7
Author: Arthur Cohen <arthur.cohen@embecosm.com>
Date:   Wed Sep 14 10:23:46 2022 +0200

    module lowering: Do not append null pointers as items
    
    Some module items do not need to get lowered to HIR such as `macro_rules!` definitions. Hence, module lowering should act the same as crate lowering: Only emplace back the lowered item if it is a valid pointer

Diff:
---
 gcc/rust/hir/rust-ast-lower-item.cc   |  5 ++++-
 gcc/testsuite/rust/compile/macro44.rs | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/gcc/rust/hir/rust-ast-lower-item.cc b/gcc/rust/hir/rust-ast-lower-item.cc
index fefc938b8e5..336be5bdfaf 100644
--- a/gcc/rust/hir/rust-ast-lower-item.cc
+++ b/gcc/rust/hir/rust-ast-lower-item.cc
@@ -59,7 +59,10 @@ ASTLoweringItem::visit (AST::Module &module)
   for (auto &item : module.get_items ())
     {
       auto transitem = translate (item.get ());
-      items.push_back (std::unique_ptr<Item> (transitem));
+      // The item may be null if it doesn't need to live in the HIR - for
+      // example, macro rules definitions
+      if (transitem)
+	items.push_back (std::unique_ptr<Item> (transitem));
     }
 
   // should be lowered/copied from module.get_in/outer_attrs()
diff --git a/gcc/testsuite/rust/compile/macro44.rs b/gcc/testsuite/rust/compile/macro44.rs
new file mode 100644
index 00000000000..84b2cdbb506
--- /dev/null
+++ b/gcc/testsuite/rust/compile/macro44.rs
@@ -0,0 +1,34 @@
+mod foo {
+    mod bar {
+        mod baz {
+            macro_rules! baz {
+                () => {{}};
+            }
+        }
+    }
+
+    macro_rules! foo {
+        () => {{}};
+    }
+
+    fn foo_f() { // { dg-warning "function is never used" }
+        foo!();
+    }
+
+    fn bar_f() { // { dg-warning "function is never used" }
+        baz!();
+    }
+}
+
+mod foo2 {
+    #[macro_export]
+    macro_rules! bar1 {
+        () => {};
+    }
+
+    macro_rules! bar2 {
+        () => {};
+    }
+}
+
+fn main() {}