From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id BD7C0385782C; Fri, 29 Jul 2022 14:45:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BD7C0385782C 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 #1421 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: 7f1685d7f60c29eeabbd3c556428b67142201df2 X-Git-Newrev: 2d824b796cde571d270f4c20af8183dbd93614d5 Message-Id: <20220729144502.BD7C0385782C@sourceware.org> Date: Fri, 29 Jul 2022 14:45:02 +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: Fri, 29 Jul 2022 14:45:02 -0000 https://gcc.gnu.org/g:2d824b796cde571d270f4c20af8183dbd93614d5 commit 2d824b796cde571d270f4c20af8183dbd93614d5 Merge: 7f1685d7f60 5e63ca064ab Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Fri Jul 29 12:32:30 2022 +0000 Merge #1421 1421: expand: further improves the handling of recursive macros r=CohenArthur a=liushuyu - expand: further improves the handling of recursive macros. Now all the attribute visitor that expands the macro fragment will recursively expand the macro using the unified expanding function `expand_macro_fragment_recursive` instead of expanding the fragment only once. Fixes #1403 Co-authored-by: liushuyu Diff: gcc/rust/expand/rust-attribute-visitor.cc | 27 +++++--------- gcc/rust/expand/rust-attribute-visitor.h | 42 ++++++++++++++++++++-- .../rust/compile/torture/macro-issue1403.rs | 23 ++++++++++++ 3 files changed, 71 insertions(+), 21 deletions(-)