public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc/devel/rust/master] Do not crash on empty macros expand. Fixes #1712
@ 2023-01-26  7:27 Thomas Schwinge
  0 siblings, 0 replies; only message in thread
From: Thomas Schwinge @ 2023-01-26  7:27 UTC (permalink / raw)
  To: gcc-cvs

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

commit fc0c03dcf756c89694845484abd7d74ed080fdb6
Author: Lyra <teromene@teromene.fr>
Date:   Tue Jan 24 14:15:42 2023 +0100

    Do not crash on empty macros expand. Fixes #1712
    
    This commit fixes a compiler crash when expanding an empty macro into an existing AST.
    
    Signed-off-by: Lyra Karenai <teromene@teromene.fr>

Diff:
---
 gcc/rust/expand/rust-macro-expand.cc  | 2 ++
 gcc/testsuite/rust/compile/macro45.rs | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/gcc/rust/expand/rust-macro-expand.cc b/gcc/rust/expand/rust-macro-expand.cc
index 589443453d6..36b3195f912 100644
--- a/gcc/rust/expand/rust-macro-expand.cc
+++ b/gcc/rust/expand/rust-macro-expand.cc
@@ -839,6 +839,8 @@ static AST::Fragment
 transcribe_expression (Parser<MacroInvocLexer> &parser)
 {
   auto expr = parser.parse_expr ();
+  if (expr == nullptr)
+    return AST::Fragment::create_error ();
 
   return AST::Fragment::complete ({std::move (expr)});
 }
diff --git a/gcc/testsuite/rust/compile/macro45.rs b/gcc/testsuite/rust/compile/macro45.rs
new file mode 100644
index 00000000000..52dbcbb0016
--- /dev/null
+++ b/gcc/testsuite/rust/compile/macro45.rs
@@ -0,0 +1,7 @@
+macro_rules! empty {
+    () => {}; // { dg-error "found unexpected token '\}' in null denotation" }
+}
+
+fn main() {
+    let a = empty!();
+}

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2023-01-26  7:27 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-26  7:27 [gcc/devel/rust/master] Do not crash on empty macros expand. Fixes #1712 Thomas Schwinge

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).