public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Thomas Schwinge <tschwinge@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] Do not crash on empty macros expand. Fixes #1712 Date: Thu, 26 Jan 2023 07:27:02 +0000 (GMT) [thread overview] Message-ID: <20230126072702.BCF2D3858C83@sourceware.org> (raw) 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!(); +}
reply other threads:[~2023-01-26 7:27 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230126072702.BCF2D3858C83@sourceware.org \ --to=tschwinge@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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).