From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 8D8893858C1F; Mon, 30 Jan 2023 17:24:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8D8893858C1F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1675099499; bh=rp18P6Wn8Q3P9oOMBJH5drxL/DR59auzQerGTAdRkMs=; h=From:To:Subject:Date:From; b=KAOPf2knkWg/Cy775NGQ4WSLZnKL3ISimQXgwQVcMdaacIi1DskIKfCXzYnyUwoPN OfJFh7hlJw7LavWVpdkYvNoYn7AmoZ6ojmyLNOtQEtNSpE1dZn04qxyQO4Nw4SONxh WwliTJ83bhzyxaObfg3ahrvYkykY8Hz8s6y7cdMw= 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 #1735 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: 0ae13efb5a6383a3e7e22ceb064fa358038bd36f X-Git-Newrev: d7c321da9f8fdee4527285c782db57c7c4d520e4 Message-Id: <20230130172459.8D8893858C1F@sourceware.org> Date: Mon, 30 Jan 2023 17:24:59 +0000 (GMT) List-Id: https://gcc.gnu.org/g:d7c321da9f8fdee4527285c782db57c7c4d520e4 commit d7c321da9f8fdee4527285c782db57c7c4d520e4 Merge: 0ae13efb5a6 3630e0e2bf0 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Mon Jan 30 12:44:25 2023 +0000 Merge #1735 1735: macro: Allow builtin `MacroInvocation`s within the AST r=CohenArthur a=CohenArthur gcc/rust/ChangeLog: * ast/rust-macro.h (enum class): Add `BuiltinMacro` enum class * expand/rust-attribute-visitor.cc (AttrVisitor::visit): Mention switching on `macro.kind` once builtin macro invocations are properly handled * parse/rust-parse-impl.h (Parser::parse_macro_invocation): Switch to new MacroInvocation API (Parser::parse_type): Switch to new MacroInvocation API (Parser::parse_type_no_bounds): Switch to new MacroInvocation API This will be necessary for proper handling of builtin macros with the new `EarlyNameResolver` class and associated fixed-point algorithm Co-authored-by: Arthur Cohen Diff: gcc/rust/ast/rust-macro.h | 110 +++++++++++++++++++++++++----- gcc/rust/expand/rust-attribute-visitor.cc | 2 + gcc/rust/parse/rust-parse-impl.h | 70 +++++++++---------- 3 files changed, 126 insertions(+), 56 deletions(-)