From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by sourceware.org (Postfix) with ESMTPS id 47D363858D37 for ; Wed, 21 Feb 2024 13:16:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 47D363858D37 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 47D363858D37 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::62c 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-x62c.google.com with SMTP id a640c23a62f3a-a3f3d0d2787so86823166b.3 for ; Wed, 21 Feb 2024 05:16:29 -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=NeQcP5RFmhOTIY8VtFDjSPKOiVssIbybdHAIBbz2FKvE3T8sCDQmzfybcQdUispj2s cUIFxdfVKIqLy1l63ugAnV7PsDtS7Ge2sbsNbjGGS5Rzb/k+FEw4A+K8wpnLoO5zq5Vq zWBevRfQUxo8icmZbwP4T5+HAPHpqhXIz3wOdbIne5iv/k8YShfGLcwO/YEr6/252joS 7jXsEjU5d2fvfo3JQIxzY3BmU4436lS4Rf+9AJyba4C5HCVGF+5ypV24s9nCFcUXK2oN FWUhVncqNLgYYP64oF1ZqFyDXEaN8PsXQwYtTXL0aMAJJMxscJHowhXmWOyzA8MVisC3 BATw== X-Gm-Message-State: AOJu0YyYiXtSMg7loNUIH1HS8+aXjO+Kd9grJUWsvKADsLW+ecpwSR+M 1GeQwDAYER4TEQ/m3tI1Wfw3AWShJHAVg+E5ywLBjbHrg2pcgIX0jwIr/i7soloQlF8ysKg84Y0 = 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> Reply-To: arthur.cohen@embecosm.com MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 List-Id: 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 +} -- 2.42.1