From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7905) id 649493858017; Tue, 31 Jan 2023 13:15:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 649493858017 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1675170907; bh=qynvf4Cros4u5ltEshWtgBiR58HZ3/BLUnU6fdG1QIc=; h=From:To:Subject:Date:From; b=stE6Ou8iJ95X8CJXOhGL/zsKeF9MW0vQFy1LIPTDm+p/CMQhuA0O9IJZVsMVxCP9O WiapfRbl+07SScFdSdF1m6HrrtgiNU9mUADHBRRycSPNntFanAQtRPTZQjHNVzC0Tt 4JnWcmR+LSRC9THCH/7/zEcJGYXye1z0vdSTE9xY= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Arthur Cohen To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-5544] gccrs: ast: Only expand expressions and types if the kind is right X-Act-Checkin: gcc X-Git-Author: Arthur Cohen X-Git-Refname: refs/heads/master X-Git-Oldrev: 7dc41901213d32ff9962f1d54cc6291c38d0e597 X-Git-Newrev: 55fb35c51b2ee6b107204b6a02193cbeef077d01 Message-Id: <20230131131507.649493858017@sourceware.org> Date: Tue, 31 Jan 2023 13:15:07 +0000 (GMT) List-Id: https://gcc.gnu.org/g:55fb35c51b2ee6b107204b6a02193cbeef077d01 commit r13-5544-g55fb35c51b2ee6b107204b6a02193cbeef077d01 Author: Arthur Cohen Date: Mon Aug 29 13:37:13 2022 +0200 gccrs: ast: Only expand expressions and types if the kind is right gcc/rust/ChangeLog: * ast/rust-ast.h: Add assertions and accessors for fragment nodes. * expand/rust-attribute-visitor.cc (AttrVisitor::visit): Fix expansion context typo when visiting `InherentImpl` items. (AttrVisitor::maybe_expand_expr): Use new Fragment accessor to fetch properly typed node. (AttrVisitor::maybe_expand_type): Likewise. * expand/rust-macro-expand.cc (transcribe_type): Emit parse errors when trying to parse a type. Diff: --- gcc/rust/ast/rust-ast.h | 15 +++++++++++++++ gcc/rust/expand/rust-attribute-visitor.cc | 11 +++++++---- gcc/rust/expand/rust-macro-expand.cc | 4 +++- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/gcc/rust/ast/rust-ast.h b/gcc/rust/ast/rust-ast.h index 213208efb56..58fe2674479 100644 --- a/gcc/rust/ast/rust-ast.h +++ b/gcc/rust/ast/rust-ast.h @@ -24,6 +24,7 @@ #include "rust-hir-map.h" #include "rust-token.h" #include "rust-location.h" +#include "rust-diagnostics.h" namespace Rust { // TODO: remove typedefs and make actual types for these @@ -1868,6 +1869,10 @@ private: */ bool is_single_fragment () const { return nodes.size () == 1; } + bool is_single_fragment (SingleASTNode::NodeType expected) const + { + return is_single_fragment () && nodes[0].get_kind () == expected; + } bool is_single_fragment_kind (SingleASTNode::NodeType kind) const { @@ -1913,6 +1918,16 @@ public: bool should_expand () const { return !is_error (); } + bool is_expression_fragment () const + { + return is_single_fragment (SingleASTNode::NodeType::EXPRESSION); + } + + bool is_type_fragment () const + { + return is_single_fragment (SingleASTNode::NodeType::TYPE); + } + std::unique_ptr take_expression_fragment () { rust_assert (is_single_fragment_kind (SingleASTNode::NodeType::EXPRESSION)); diff --git a/gcc/rust/expand/rust-attribute-visitor.cc b/gcc/rust/expand/rust-attribute-visitor.cc index 15aedbfa668..673f0432a30 100644 --- a/gcc/rust/expand/rust-attribute-visitor.cc +++ b/gcc/rust/expand/rust-attribute-visitor.cc @@ -2662,7 +2662,7 @@ AttrVisitor::visit (AST::InherentImpl &impl) for (auto ¶m : impl.get_generic_params ()) param->accept_vis (*this); - expander.push_context (MacroExpander::ContextType::TYPE); + expander.push_context (MacroExpander::ContextType::ITEM); auto &type = impl.get_type (); type->accept_vis (*this); @@ -2706,7 +2706,7 @@ AttrVisitor::visit (AST::TraitImpl &impl) for (auto ¶m : impl.get_generic_params ()) param->accept_vis (*this); - expander.push_context (MacroExpander::ContextType::TYPE); + expander.push_context (MacroExpander::ContextType::ITEM); auto &type = impl.get_type (); type->accept_vis (*this); @@ -3427,11 +3427,13 @@ AttrVisitor::visit (AST::BareFunctionType &type) // no where clause, apparently } + void AttrVisitor::maybe_expand_expr (std::unique_ptr &expr) { auto final_fragment = expand_macro_fragment_recursive (); - if (final_fragment.should_expand ()) + if (final_fragment.should_expand () + && final_fragment.is_expression_fragment ()) expr = final_fragment.take_expression_fragment (); } @@ -3439,7 +3441,8 @@ void AttrVisitor::maybe_expand_type (std::unique_ptr &type) { auto final_fragment = expand_macro_fragment_recursive (); - if (final_fragment.should_expand ()) + if (final_fragment.should_expand () && final_fragment.is_type_fragment ()) type = final_fragment.take_type_fragment (); } + } // namespace Rust diff --git a/gcc/rust/expand/rust-macro-expand.cc b/gcc/rust/expand/rust-macro-expand.cc index ed1b838c987..c68faba86ad 100644 --- a/gcc/rust/expand/rust-macro-expand.cc +++ b/gcc/rust/expand/rust-macro-expand.cc @@ -864,7 +864,9 @@ transcribe_expression (Parser &parser) static AST::ASTFragment transcribe_type (Parser &parser) { - auto type = parser.parse_type (); + auto type = parser.parse_type (true); + for (auto err : parser.get_errors ()) + err.emit_error (); return AST::ASTFragment ({std::move (type)}); }