From: Fangrui Song <maskray@gcc.gnu.org>
Date: Wed, 15 May 2024 22:05:30 +0000 (-0700)
Subject: gas: Fix \+ expansion for .irp and .irpc
X-Git-Tag: gdb-15-branchpoint~88
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b1d28350499d0553067e774f72e4e98c836ae92f;p=thirdparty%2Fbinutils-gdb.git

gas: Fix \+ expansion for .irp and .irpc

.irp and .irpc receive a null macro_entry.  \+ causes a crash after the
recent \+ support.  Restore the previous behavior.

Signed-off-by: Fangrui Song <maskray@gcc.gnu.org>
---

diff --git a/gas/macro.c b/gas/macro.c
index 72d869d317f..3036e6a5866 100644
--- a/gas/macro.c
+++ b/gas/macro.c
@@ -854,7 +854,7 @@ macro_expand_body (sb *in, sb *out, formal_entry *formals,
 	      sprintf (buffer, "%u", macro_number);
 	      sb_add_string (out, buffer);
 	    }
-	  else if (src < in->len && in->ptr[src] == '+')
+	  else if (macro && src < in->len && in->ptr[src] == '+')
 	    {
 	      /* Sub in the current macro invocation number.  */
 
diff --git a/gas/testsuite/gas/macros/count.l b/gas/testsuite/gas/macros/count.l
index 3418b0bab00..ca666ea0195 100644
--- a/gas/testsuite/gas/macros/count.l
+++ b/gas/testsuite/gas/macros/count.l
@@ -8,3 +8,5 @@
 1
 4
 2
+\+
+\+
diff --git a/gas/testsuite/gas/macros/count.s b/gas/testsuite/gas/macros/count.s
index c752ca8367d..4a5b078ba60 100644
--- a/gas/testsuite/gas/macros/count.s
+++ b/gas/testsuite/gas/macros/count.s
@@ -17,3 +17,10 @@
 
 	mac1 2
 	mac2 3
+
+	.irp i,1
+	.print "\+"
+	.endr
+	.irpc i,1
+	.print "\+"
+	.endr