From patchwork Wed Feb 21 13:15:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Cohen X-Patchwork-Id: 1902109 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=embecosm.com header.i=@embecosm.com header.a=rsa-sha256 header.s=google header.b=Nw4Rkq8P; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TfxgL0dt2z23d2 for ; Thu, 22 Feb 2024 00:18:54 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0CA0638582B5 for ; Wed, 21 Feb 2024 13:18:52 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by sourceware.org (Postfix) with ESMTPS id 5D7F7385841E for ; Wed, 21 Feb 2024 13:16:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5D7F7385841E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5D7F7385841E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::634 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708521392; cv=none; b=QAQiTJ4qDpNa8Dx9NJM0mHJ12nCBW+XWn2dRw5YCzgediv0Vfv9sr+tVsMOc398bT1Pewa6NtBfhcuNPPTkfmEE5HZGRtA4l8N4EHiCwrbqr29OlQyNMF/829sfs6uJzhviImx69nJ9Zm/k942qPmW4Y3NlEPRcTrQE1xPWygA8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708521392; c=relaxed/simple; bh=fbt/oOP48uTIMY6REn0c751HviqTLi6qx3jLPmlMHOY=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=qTPermajX1Lb1cmGHTxQ465lIpPDoKAKvvt517MQ9rJnmouM1tNncWZ9X/6t8jf4r6TMgVEDgnJulIXAPGkpB5aiF3/en/0UtpeRNbCrHvvVewHpqm8rZCQhcKYzwsLvcdAwx0UQPpgS3tF5bVCVcQJmCDl0yQDPiQH3G/41rb4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-a3e6f79e83dso467563366b.2 for ; Wed, 21 Feb 2024 05:16:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1708521388; x=1709126188; darn=gcc.gnu.org; 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=5yQrny6nQa543UnwFmAfsqRim8/Z3IC5WxQ+YZDzqvo=; b=Nw4Rkq8PAur3WCBZ5WkrNrSCbr0t7lKw4SbRX3JfEVir58Y/ZiTtblaqLdx1/iDsDH FmXBPA/dZexUJFwi5vx2200f33+E9XNrqYiQ2RfNcSQE4Z1rhgdgKgXirisuDIH6qH+b 2SS5fHuT6/OChBymJH/m5LIml74Fujlqz41iMclNyr4e7W/dxAzF8FTbH87MnT0BlJ12 Jlwt11uKhm/Kt3k7p21dqzJXb3W0TRsuNEtEVXG3Hv/KB1Nf3SRriVamQjSz2gPSPOkV 0SIzq7CeCChiVQvgnJsEVWs98l9IDqmCb8ZBbbanrmAPR83ptYP0bttpf29UYx5Cqy95 8OOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708521388; x=1709126188; 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=5yQrny6nQa543UnwFmAfsqRim8/Z3IC5WxQ+YZDzqvo=; b=YYaPH9MlnIlKVBNmK1BXjTg1Yi600MYYevfOP1VgCnikAIJ/CW+jJ4C2uddE0ZFLo2 5A+6FoyEmrrnv2IrZfudFkoxaxaM4f8/+Aj3zZxRsGgPFqTNfea9xXsSAtXPxR4xmMSO 0gW9EkPQD5KxhWNpHYN1GMjRj0UHuetfMekaSTUCUEb/E/+GhkggOzyV3xR4/HbSD5pa Sm4daipeuCJSEQEn7WOwcpAI8Zp/PIv46UBYiyaIZrOyFBFbT+KzKqa7FLewl7MAj2F/ WRnGZ0f2drn+JU7tsINLFJIGUnEDyLMWPbTpT3QRPnihp4OrvMXwbc41SOsP4InQ+daS YXCQ== X-Gm-Message-State: AOJu0YwV2PXdIwtfQ2wctog1a9vyWFAXWM4H9mMhktbiqSV58bhfsOkR LTvL4xrH6jiacGnEmJexYKJKjHzPfAMFVwmHihsB+DIoZF5+R/FWgJp3+5Xz0bbPo6aQqI7wUGA = X-Google-Smtp-Source: AGHT+IHOpzqjLGXFxXZCzIAaOei1IhYGQnawo9PGDKtRJsiXlVyhXhh2nIX4pPGnYWK71wSX5aRRSA== X-Received: by 2002:a17:906:c0a:b0:a3f:6513:1489 with SMTP id s10-20020a1709060c0a00b00a3f65131489mr57054ejf.55.1708521387970; Wed, 21 Feb 2024 05:16:27 -0800 (PST) Received: from platypus.localdomain ([62.23.166.218]) by smtp.gmail.com with ESMTPSA id m12-20020a170906160c00b00a3d0a094574sm4927074ejd.66.2024.02.21.05.16.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Feb 2024 05:16:27 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Owen Avery Subject: [COMMITTED 7/9] gccrs: Fix lookup of TuplePattern sub-pattern types Date: Wed, 21 Feb 2024 14:15:25 +0100 Message-ID: <20240221131636.3336103-10-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20240221131636.3336103-2-arthur.cohen@embecosm.com> References: <20240221131636.3336103-2-arthur.cohen@embecosm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-14.1 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, T_SCC_BODY_TEXT_LINE 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.30 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+incoming=patchwork.ozlabs.org@gcc.gnu.org From: Owen Avery gcc/rust/ChangeLog: * backend/rust-compile-pattern.cc (CompilePatternLet::visit): Lookup type of sub-pattern, not tuple pattern itself. gcc/testsuite/ChangeLog: * rust/compile/issue-2847-b.rs: New test. Signed-off-by: Owen Avery --- gcc/rust/backend/rust-compile-pattern.cc | 12 ++++++------ gcc/testsuite/rust/compile/issue-2847-b.rs | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 gcc/testsuite/rust/compile/issue-2847-b.rs diff --git a/gcc/rust/backend/rust-compile-pattern.cc b/gcc/rust/backend/rust-compile-pattern.cc index 4fa611f5383..1a32f02c3ea 100644 --- a/gcc/rust/backend/rust-compile-pattern.cc +++ b/gcc/rust/backend/rust-compile-pattern.cc @@ -678,8 +678,8 @@ CompilePatternLet::visit (HIR::TuplePattern &pattern) for (auto &sub : items_lower) { TyTy::BaseType *ty_sub = nullptr; - HirId pattern_id = pattern.get_mappings ().get_hirid (); - bool ok = ctx->get_tyctx ()->lookup_type (pattern_id, &ty_sub); + HirId sub_id = sub->get_mappings ().get_hirid (); + bool ok = ctx->get_tyctx ()->lookup_type (sub_id, &ty_sub); rust_assert (ok); tree sub_init @@ -697,8 +697,8 @@ CompilePatternLet::visit (HIR::TuplePattern &pattern) for (auto &sub : items_upper) { TyTy::BaseType *ty_sub = nullptr; - HirId pattern_id = pattern.get_mappings ().get_hirid (); - bool ok = ctx->get_tyctx ()->lookup_type (pattern_id, &ty_sub); + HirId sub_id = sub->get_mappings ().get_hirid (); + bool ok = ctx->get_tyctx ()->lookup_type (sub_id, &ty_sub); rust_assert (ok); tree sub_init @@ -719,8 +719,8 @@ CompilePatternLet::visit (HIR::TuplePattern &pattern) for (auto &sub : items.get_patterns ()) { TyTy::BaseType *ty_sub = nullptr; - HirId pattern_id = pattern.get_mappings ().get_hirid (); - bool ok = ctx->get_tyctx ()->lookup_type (pattern_id, &ty_sub); + HirId sub_id = sub->get_mappings ().get_hirid (); + bool ok = ctx->get_tyctx ()->lookup_type (sub_id, &ty_sub); rust_assert (ok); tree sub_init diff --git a/gcc/testsuite/rust/compile/issue-2847-b.rs b/gcc/testsuite/rust/compile/issue-2847-b.rs new file mode 100644 index 00000000000..ab2614210fc --- /dev/null +++ b/gcc/testsuite/rust/compile/issue-2847-b.rs @@ -0,0 +1,4 @@ +pub fn test() -> i32 { + let (a, _) = (1, 2); + a +}