From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id BCF2D3858C83; Thu, 26 Jan 2023 07:27:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BCF2D3858C83 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1674718022; bh=EXWR0m4Hb4GltEQAnlPSDlbZVah8yLtYUC3f8OhKR0g=; h=From:To:Subject:Date:From; b=yfle2BFUlxqq2nbbYU8jVh2pM8erbsUSlIWY89PjPcFhwgPbukxgKEGCiqfwAX1g8 k1QqoewPwd+Neuwm2bAPePU0M3Ql4WTe/DpqK4yiWHD1c2+7IaAHRjCYj4itTdafv1 vwGO3aieC/CKwMEWGdPME8TWxogEVOgOkd+Y8y5s= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] Do not crash on empty macros expand. Fixes #1712 X-Act-Checkin: gcc X-Git-Author: Lyra X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: 01c232573e8d9d9fac47ebfee8459e3b493ce278 X-Git-Newrev: fc0c03dcf756c89694845484abd7d74ed080fdb6 Message-Id: <20230126072702.BCF2D3858C83@sourceware.org> Date: Thu, 26 Jan 2023 07:27:02 +0000 (GMT) List-Id: https://gcc.gnu.org/g:fc0c03dcf756c89694845484abd7d74ed080fdb6 commit fc0c03dcf756c89694845484abd7d74ed080fdb6 Author: Lyra 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 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 &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!(); +}