From patchwork Wed Apr 5 14:03:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Cohen X-Patchwork-Id: 79674 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp348696vqo; Wed, 5 Apr 2023 07:26:39 -0700 (PDT) X-Google-Smtp-Source: AKy350ZJ/5/8+ajIubDhU5Jgyn2pXwsCnwIdxfU55ZEjFGMUOhgXEJ7/RU0vLmNIV5BS7+heOPI5 X-Received: by 2002:aa7:cd5b:0:b0:4fc:d331:515 with SMTP id v27-20020aa7cd5b000000b004fcd3310515mr1876785edw.5.1680704799581; Wed, 05 Apr 2023 07:26:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680704799; cv=none; d=google.com; s=arc-20160816; b=p7Ykv8Lm8pXurhE1ffOilGfFrRgzIlnhBz8pgUevE/c7yCExHliHKXnUecuklyLWjX uRg63rh8V+SYsL2EB6EEgoe7v4+KuaWcgwnEj9tA0MPP7S+nlvbRTyE3y+GLl48co+cs IlWurpJynKr7iutNUkAhpjSQa1AtdLtKzkxhkaYpF/Vm7ujmOsWqVA+F+rYcI4Z6puWv 0d6g9Xza31kf6iyN3Zx25cbtC9/TfOHEXs6FzRaQhuLsc0Kqy7OkhviCPJZHwlF1ngVa xuRbHTvoKfeJtI1Gn6mhps9Hc5S4wmUzznudRdZulpZIcvQBHggNTGzPq8Z1edY5o7F4 HqqQ== 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=Pk/YR01fm2xN7HmxJNkxvY1XwVk0ob+ZXWLT0uilaw0=; b=Zxj+mOpBe65rHgFmMhhv5KdVO1s+OzlTXMbWUrxOoXWlV1y4ZD0Zars0U2ch+mFxcR O9e9qVNJwglhscrul4UpLQWKkoN1m1BANt7daANGrbxENaj7TGI11EzxiK2lEQBQtTII dRjHfR5u7DNeKjFDkz1TyGaaGn82ZAGA8Un4ZqS2aToSz7mBsviR7FDblqvRaubmpRt5 tnYezkXilaPgWL/dV/t2RBb4ATGB2JgVsIaWeHPJ6GfGwt3GciCw6dHwZoPbAF9/K7Mw boQqVJvfv/zQGHltR6MzuPX8nJeeYPzLVX8Gn/CZOWqjEERZWSYhquRvYWd6ZAydyDaq loNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@embecosm.com header.s=google header.b=EysPVRRP; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id r23-20020a056402035700b005021d251232si3942287edw.20.2023.04.05.07.26.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Apr 2023 07:26:39 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@embecosm.com header.s=google header.b=EysPVRRP; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 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 6157138E4D2B for ; Wed, 5 Apr 2023 14:11:32 +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 CB87438555AC for ; Wed, 5 Apr 2023 14:05:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CB87438555AC 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 p34so20958044wms.3 for ; Wed, 05 Apr 2023 07:05:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1680703549; 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=Pk/YR01fm2xN7HmxJNkxvY1XwVk0ob+ZXWLT0uilaw0=; b=EysPVRRPr7iDBWyMu3A3gmluDdNn/nIACx7sbaoFieqqLPApZL52kcJgBvgcTn99VJ bU2KsleNCIQpuVktZq0ngZsjio7cfIIJDwM88tWePw92gb88iC1e+sab9vJo80KUs/CP FUoshlBiP0A+CthUCC6pnXmmek9vt3exu8eJuib1UTbp2HQ/VC1yRe5P45pcBKFihFAa Z7N5AA8BHbaU0be91lBOe8lZlsziVnqW5RuKhiy9b3Hb1ybuRUSh3+4oNW1ZdoeoxKq7 e0VOK+Ydm384QvBVQ+knJPRjXRIlJrwWLGnJEF+VolC/N4JlxiX1w+VYEpMxgnwCV8M3 usbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680703549; 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=Pk/YR01fm2xN7HmxJNkxvY1XwVk0ob+ZXWLT0uilaw0=; b=ZI0D5gYHkGLyvgCDLBsUCNObzkYIokp6C1dHqmNY3WABB7nkROYHWzdtyZT8lW419l zWlrBISDwC2Fx1rofhnp2PCnhMTtQSJ+zcGlsNLbS6yQ4nGotZZNHf+784oBF/YmEkBd X7d2afthi5s0bho1DxTQllF5BUTR39KkltzN+PCM9kcveQ1bz3FH/mgNlV1+ALEmJb4S yOx8Y443WGyR78bhkkEe+XvpQc2GLf0r+SuWvDDbYHb6YUh+p+4wk3CV612ezCRIXXJG d+Esi/3UmAmmPhgVF4eVlwAMoOLuJADrv1SmRSPujJF+b34sdqBkn3QRteWNOhlfCwHt 4+Vw== X-Gm-Message-State: AAQBX9d0Zg5f8LvaunwbNDlQdKc+2xw431YM5qA1ib4/Y9jjNWvXSI94 TuWBHO2NWYd0By2HAAcC+416W9Pg9G7a6jFq2Q== X-Received: by 2002:a7b:cb50:0:b0:3ee:6d88:774a with SMTP id v16-20020a7bcb50000000b003ee6d88774amr1824962wmj.14.1680703549409; Wed, 05 Apr 2023 07:05:49 -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.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Apr 2023 07:05:48 -0700 (PDT) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Owen Avery Subject: [committed 30/88] gccrs: Implement lowering ReferencePattern from AST to HIR Date: Wed, 5 Apr 2023 16:03:14 +0200 Message-Id: <20230405140411.3016563-31-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=unavailable 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?1762346715899594451?= X-GMAIL-MSGID: =?utf-8?q?1762346715899594451?= From: Owen Avery gcc/rust/ChangeLog: * ast/rust-pattern.h: (ReferencePattern::is_double_reference): Add method. (ReferencePattern::get_is_mut): Add method. * hir/rust-ast-lower-pattern.cc (ASTLoweringPattern::visit): Add ReferencePattern visitor. * hir/rust-ast-lower-pattern.h: (ASTLoweringPattern::visit): Add ReferencePattern visitor. Signed-off-by: Owen Avery --- gcc/rust/ast/rust-pattern.h | 4 ++++ gcc/rust/hir/rust-ast-lower-pattern.cc | 29 ++++++++++++++++++++++++++ gcc/rust/hir/rust-ast-lower-pattern.h | 1 + 3 files changed, 34 insertions(+) diff --git a/gcc/rust/ast/rust-pattern.h b/gcc/rust/ast/rust-pattern.h index c86bdf6f820..cf5d2ead10d 100644 --- a/gcc/rust/ast/rust-pattern.h +++ b/gcc/rust/ast/rust-pattern.h @@ -469,6 +469,10 @@ public: return pattern; } + bool is_double_reference () const { return has_two_amps; } + + bool get_is_mut () const { return is_mut; } + NodeId get_node_id () const { return node_id; } NodeId get_pattern_node_id () const override final { return node_id; } diff --git a/gcc/rust/hir/rust-ast-lower-pattern.cc b/gcc/rust/hir/rust-ast-lower-pattern.cc index a0fd8dded38..1961c740624 100644 --- a/gcc/rust/hir/rust-ast-lower-pattern.cc +++ b/gcc/rust/hir/rust-ast-lower-pattern.cc @@ -249,5 +249,34 @@ ASTLoweringPattern::visit (AST::GroupedPattern &pattern) pattern.get_pattern_in_parens ()->accept_vis (*this); } +void +ASTLoweringPattern::visit (AST::ReferencePattern &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_referenced_pattern ().get ()); + + translated + = new HIR::ReferencePattern (mapping, std::unique_ptr (inner), + pattern.get_is_mut () ? Mutability::Mut + : Mutability::Imm, + pattern.get_locus ()); + + if (pattern.is_double_reference ()) + { + Analysis::NodeMapping mapping2 (crate_num, pattern.get_node_id (), + mappings->get_next_hir_id (crate_num), + UNKNOWN_LOCAL_DEFID); + translated + = new HIR::ReferencePattern (mapping2, + std::unique_ptr (translated), + Mutability::Imm, 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 0075e27e9c0..2d175a25cb4 100644 --- a/gcc/rust/hir/rust-ast-lower-pattern.h +++ b/gcc/rust/hir/rust-ast-lower-pattern.h @@ -40,6 +40,7 @@ public: void visit (AST::LiteralPattern &pattern) override; void visit (AST::RangePattern &pattern) override; void visit (AST::GroupedPattern &pattern) override; + void visit (AST::ReferencePattern &pattern) override; private: ASTLoweringPattern ();