From patchwork Wed Apr 5 14:02:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Cohen X-Patchwork-Id: 79631 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp341656vqo; Wed, 5 Apr 2023 07:16:41 -0700 (PDT) X-Google-Smtp-Source: AKy350ZYQOaMxuPs+EuIg0r0KSxy0vVEkoOW4OveL+F7EYZEkh9HnAI9W3ttJ7AVORrS0JtQEUsq X-Received: by 2002:aa7:ce0c:0:b0:4ac:ce82:9825 with SMTP id d12-20020aa7ce0c000000b004acce829825mr2157932edv.16.1680704201285; Wed, 05 Apr 2023 07:16:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680704201; cv=none; d=google.com; s=arc-20160816; b=ZrWwxq7Mm5sSiV8ZgmSCg6CPJNh/JB7jVtfrMN5osyPBSYfRJ9MKQuTkPUu01xbgRm wTnX7gVoYE6HCMn0MKorAyB2x6wjVQrCw/GEIoN7QuiE9ZtX3QX4Tp9n9IQ0WbjKl4Zi vHg8cpdt+RcNM5oFnswhvU0OI7f/yK4R4AkUyU4ZHvzqin+7/TJPlXvQ+i2oLIjAYGHV /26a6AGIlU1SGZG4tSDyvhhftE1XAPhHs/Jvwn3doV+c3/p8H7tLyvWoOgpTq0WYUwQf GUbZhxq/1QZJnzLoeD6K5kDMsC49GH9Qxk26DPIxI4Jn/2T/+PFeao2mCay00KidN8WF iDqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature:dmarc-filter :delivered-to; bh=3+JwrA5Px+x7StU2k1VGnS5w8ORk8tczXa/XIvXs5eQ=; b=U+dIkafWpDw8gNvvtgMSQ9mLNrTX3uomBxnPYJvP0BRoh7sRv7NA8EC8gbjptybokr dfrQ6qxGKwsN6s6gHlpKIH7JNvo3eEX87Od1xbnJ/GoIQK8BkbQaey4BcPYi4VGnFRpm nobcst1kqCZ8dDLWm6GxCWm+CJRuoosQv3zAg/ki/iqFcl4ocLfkmxzPqk+sGuyTXe9l SwkHE0obaACGIWv4+Xv/IVannmDTIrgmT3T7CO7qTz+7OlhEGkrXg1spkevhnQxdNIqx 42UZMR9oOzZ0VUVT946Xt7l5kZWuQbq6UQaYGBICtniO4+u1RwWUw4ri/9IH1iz5wiwv meog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@embecosm.com header.s=google header.b=VJlnlRGG; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id w18-20020aa7d292000000b004fcf925a8acsi3082970edq.251.2023.04.05.07.16.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Apr 2023 07:16:41 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@embecosm.com header.s=google header.b=VJlnlRGG; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 146903882AEF for ; Wed, 5 Apr 2023 14:09:05 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by sourceware.org (Postfix) with ESMTPS id ED175385701E for ; Wed, 5 Apr 2023 14:05:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org ED175385701E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com Received: by mail-wm1-x32c.google.com with SMTP id i5-20020a05600c354500b003edd24054e0so23809586wmq.4 for ; Wed, 05 Apr 2023 07:05:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1680703538; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=3+JwrA5Px+x7StU2k1VGnS5w8ORk8tczXa/XIvXs5eQ=; b=VJlnlRGGLA45jR7Rjr0baZGU8/Xl/smn9GVpWv1ey6Ptxd605RagiQ7kXrKyrJqbdd woVrOUu89HqTtBd0GgTbmxSmtcx6gbltPyWijzs3ibIZlFcXmsU2XSoyBj82n1dOy9wW 9rP2IztMBi2gYAcB3BrYYxDWEL5G1hhUwTN4xXhJ0HfMUF9r3ZegOqHxyk3M1xGbGno0 Ff0rZd3WLnlG+yJns4xLlD9IexGP7NX58cCUxcnUjtfRnFUuvTZmDqIBCLYG5lKDp1T3 CoxAa8MemfwLp4ICXAyVTpGS8aACYSkdRxmQbPgcJYruuFNe/lOBZ1mMU9HGPzh6Y+yZ mAbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680703538; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=3+JwrA5Px+x7StU2k1VGnS5w8ORk8tczXa/XIvXs5eQ=; b=X0G4zn+fn/oUdtIFSUCRo09afP1n7HQH/fv3V6ZoeKdhVnBTnn+QezoLRJbw9n6knq MEeRkoa6vfMoXVYQHOXRDfglFxiVb3QhpM6VxyVz941qROOMoS8mS9wLuHj5ZHvmwcom wjDnvxD/VKQZOWt2NjQPKhSuImT4Sqyztj9RlCYS6TJzrq/AlHGAuFBkuA+tnN0lnO8f jo6Tvc97wTuJvQdmzHRBeTHQa43bpZr5gBnjqYJf6FFujRL7vbuKe50CS+gf04ij9bBm y5wX7jldF/++DTIn96gT9Y62uMtBvU4fJtl6JJ6h7R7cGnKiRFjmFd0ZGB22kNXe1zC9 WAww== X-Gm-Message-State: AAQBX9dWRgkiL2v4xTEYVBMv0ioYKYjtBfJxoPdrcVp6DYJILraBcQwe 7kL0U9qDMTwrZI7E/soD6OjmkoQmzB90O3/LBA== X-Received: by 2002:a1c:6a1a:0:b0:3f0:41b3:9256 with SMTP id f26-20020a1c6a1a000000b003f041b39256mr4889157wmc.10.1680703538300; Wed, 05 Apr 2023 07:05:38 -0700 (PDT) Received: from platypus.localdomain ([62.23.166.218]) by smtp.gmail.com with ESMTPSA id ay8-20020a05600c1e0800b003edddae1068sm2330150wmb.9.2023.04.05.07.05.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Apr 2023 07:05:38 -0700 (PDT) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Owen Avery Subject: [committed 15/88] gccrs: Add HIR lowering for GroupedPattern Date: Wed, 5 Apr 2023 16:02:59 +0200 Message-Id: <20230405140411.3016563-16-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230405140411.3016563-1-arthur.cohen@embecosm.com> References: <20230405140411.3016563-1-arthur.cohen@embecosm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-14.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: arthur.cohen@embecosm.com Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762346088538055541?= X-GMAIL-MSGID: =?utf-8?q?1762346088538055541?= From: Owen Avery gcc/rust/ChangeLog: * hir/rust-ast-lower-pattern.cc (ASTLoweringPattern::visit): Add proper visitor. * hir/rust-ast-lower-pattern.h: Declare it. Signed-off-by: Owen Avery --- gcc/rust/hir/rust-ast-lower-pattern.cc | 16 ++++++++++++++++ gcc/rust/hir/rust-ast-lower-pattern.h | 1 + 2 files changed, 17 insertions(+) diff --git a/gcc/rust/hir/rust-ast-lower-pattern.cc b/gcc/rust/hir/rust-ast-lower-pattern.cc index 30a188286c8..8ee3a979a33 100644 --- a/gcc/rust/hir/rust-ast-lower-pattern.cc +++ b/gcc/rust/hir/rust-ast-lower-pattern.cc @@ -243,5 +243,21 @@ ASTLoweringPattern::visit (AST::RangePattern &pattern) std::move (upper_bound), pattern.get_locus ()); } +void +ASTLoweringPattern::visit (AST::GroupedPattern &pattern) +{ + auto crate_num = mappings->get_current_crate (); + Analysis::NodeMapping mapping (crate_num, pattern.get_node_id (), + mappings->get_next_hir_id (crate_num), + UNKNOWN_LOCAL_DEFID); + + HIR::Pattern *inner + = ASTLoweringPattern::translate (pattern.get_pattern_in_parens ().get ()); + + translated + = new HIR::GroupedPattern (mapping, std::unique_ptr (inner), + pattern.get_locus ()); +} + } // namespace HIR } // namespace Rust diff --git a/gcc/rust/hir/rust-ast-lower-pattern.h b/gcc/rust/hir/rust-ast-lower-pattern.h index 8b191d56868..0075e27e9c0 100644 --- a/gcc/rust/hir/rust-ast-lower-pattern.h +++ b/gcc/rust/hir/rust-ast-lower-pattern.h @@ -39,6 +39,7 @@ public: void visit (AST::TuplePattern &pattern) override; void visit (AST::LiteralPattern &pattern) override; void visit (AST::RangePattern &pattern) override; + void visit (AST::GroupedPattern &pattern) override; private: ASTLoweringPattern ();