From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <tschwinge@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1643)
 id 628D3381D494; Wed,  8 Jun 2022 12:45:50 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 628D3381D494
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] macro: Add assertion to avoid undefined
 behavior
X-Act-Checkin: gcc
X-Git-Author: Arthur Cohen <arthur.cohen@embecosm.com>
X-Git-Refname: refs/heads/devel/rust/master
X-Git-Oldrev: 140f6a698b4d7157e6a33cd7b41c27b39ecbf76e
X-Git-Newrev: 2959ff8e7dd8b06bee76636af84c5aee06971397
Message-Id: <20220608124550.628D3381D494@sourceware.org>
Date: Wed,  8 Jun 2022 12:45:50 +0000 (GMT)
X-BeenThere: gcc-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-cvs mailing list <gcc-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-cvs/>
List-Help: <mailto:gcc-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Jun 2022 12:45:50 -0000

https://gcc.gnu.org/g:2959ff8e7dd8b06bee76636af84c5aee06971397

commit 2959ff8e7dd8b06bee76636af84c5aee06971397
Author: Arthur Cohen <arthur.cohen@embecosm.com>
Date:   Tue May 10 15:10:59 2022 +0200

    macro: Add assertion to avoid undefined behavior
    
    This also fixes the undefined behavior. Once again we are hurt by
    `std::vector<T>::back()` returning references and not
    pointers/`std::optional<T>`s!
    
    The cause of the bug was some overzealous popping from the context
    vector in block expressions. The amount of calls to `pop_context` is now
    the same as the amount of calls to `push_context`

Diff:
---
 gcc/rust/expand/rust-attribute-visitor.cc     |  2 --
 gcc/rust/expand/rust-macro-expand.h           |  3 +++
 gcc/testsuite/rust/compile/macro-issue1233.rs | 22 ++++++++++++++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/gcc/rust/expand/rust-attribute-visitor.cc b/gcc/rust/expand/rust-attribute-visitor.cc
index 771f034a5bb..c7c6867dd10 100644
--- a/gcc/rust/expand/rust-attribute-visitor.cc
+++ b/gcc/rust/expand/rust-attribute-visitor.cc
@@ -1193,7 +1193,6 @@ AttrVisitor::visit (AST::BlockExpr &expr)
   if (expander.fails_cfg_with_expand (expr.get_outer_attrs ()))
     {
       expr.mark_for_strip ();
-      expander.pop_context ();
       return;
     }
 
@@ -1203,7 +1202,6 @@ AttrVisitor::visit (AST::BlockExpr &expr)
   if (expander.fails_cfg_with_expand (expr.get_inner_attrs ()))
     {
       expr.mark_for_strip ();
-      expander.pop_context ();
       return;
     }
 
diff --git a/gcc/rust/expand/rust-macro-expand.h b/gcc/rust/expand/rust-macro-expand.h
index 3c53d8d099f..a5825249f33 100644
--- a/gcc/rust/expand/rust-macro-expand.h
+++ b/gcc/rust/expand/rust-macro-expand.h
@@ -275,8 +275,11 @@ struct MacroExpander
 
   ContextType pop_context ()
   {
+    rust_assert (!context.empty ());
+
     ContextType t = context.back ();
     context.pop_back ();
+
     return t;
   }
 
diff --git a/gcc/testsuite/rust/compile/macro-issue1233.rs b/gcc/testsuite/rust/compile/macro-issue1233.rs
new file mode 100644
index 00000000000..d762bb7fb9e
--- /dev/null
+++ b/gcc/testsuite/rust/compile/macro-issue1233.rs
@@ -0,0 +1,22 @@
+// { dg-additional-options "-w" }
+
+macro_rules! impl_uint {
+    ($($ty:ident = $lang:literal),*) => {
+        $(
+            impl $ty {
+                pub fn to_le(self) -> Self {
+                    #[cfg(not(target_endian = "little"))]
+                    {
+                        self
+                    }
+                    #[cfg(target_endian = "little")]
+                    {
+                        self
+                    }
+                }
+            }
+        )*
+    }
+}
+
+impl_uint!(u8 = "u8", u16 = "u16", u32 = "u32");