From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 2C5C73858284; Sat, 6 Aug 2022 12:09:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2C5C73858284 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] Merge #1429 X-Act-Checkin: gcc X-Git-Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: 8809ee8c6a5621e830f3cfe66c381f986e63c7f2 X-Git-Newrev: c788a806195f326a595cd15b96c59e7584927f1a Message-Id: <20220806120915.2C5C73858284@sourceware.org> Date: Sat, 6 Aug 2022 12:09:15 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Aug 2022 12:09:15 -0000 https://gcc.gnu.org/g:c788a806195f326a595cd15b96c59e7584927f1a commit c788a806195f326a595cd15b96c59e7584927f1a Merge: 8809ee8c6a5 9fc6a27b5c6 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Wed Aug 3 09:18:41 2022 +0000 Merge #1429 1429: expand: correctly handles non-macro nodes r=philberty a=liushuyu - expand: correctly handles non-macro nodes when expanding macros recursively to avoid improperly stripping them Fixes #1426 Co-authored-by: liushuyu Diff: gcc/rust/expand/rust-macro-expand.h | 16 ++++++++++++++ gcc/testsuite/rust/compile/macro-issue1403.rs | 31 +++++++++++++++++++++++++++ 2 files changed, 47 insertions(+)