From patchwork Thu Aug 1 14:57:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Cohen X-Patchwork-Id: 1967800 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=f85gxyFn; 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 4WZXr24tbPz1ybV for ; Fri, 2 Aug 2024 01:26:42 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F10F63851C30 for ; Thu, 1 Aug 2024 15:26:40 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by sourceware.org (Postfix) with ESMTPS id 58159386101A for ; Thu, 1 Aug 2024 14:59:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 58159386101A 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 58159386101A Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::530 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1722524450; cv=none; b=MQPwWrAEbevtV5WWVL3EPJB3zsz1pVwxOS+ieSI1azxHdVzKsgwlVKduiJSkzRxUJatTkIaBQz4LPGjlFiF90UNJbrvu8ZvqMm0m0QqT8oORz7MfNMTr483FN07rmEqmCldPgm/QdAj51qO/QzQpWiWshxXIjBcFTk4p/G1X6Sk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1722524450; c=relaxed/simple; bh=aH9LZGK5//oQxoYmgvokq8sqoJInHHEPolb6YlXVXjc=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=jNxqQEXiye+ZtnTjZZf/RjOpQfsWwndKbJJP2a/WMDGLYpPwtBAEeyAQnMhfmNw8eWOrpLvRblC5TkgkgKRYzSSwI4gSOXXpvaPfEIIWjWABoIE4btZSM+FAsgXCVfOVxMf1o0Dsum5kD2RfJwkqb1tGL9hIcoMNfHUUcUT0Dz0= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ed1-x530.google.com with SMTP id 4fb4d7f45d1cf-5a156557026so9574652a12.2 for ; Thu, 01 Aug 2024 07:59:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1722524391; x=1723129191; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Foeh4pNUusBj9Qtq8099vs8YdJxJ49vk/2pRY7HvNCQ=; b=f85gxyFn/fE9K39cZO76cLQblliUiXN2IJy6zwGLmeZPpf4ms86UBtr0/vP0iwmLju CADAo5ulgjvYMECyzXzZseTzJdwCf2O78jxtQ6HD18J+h/cpspQYdrul0krICU4vuarD 6iD5J7e8NyzYiPZu+clhtJggojxblxsFLd/4a3355/9QoWWZW/kt5QxfAZ9ODfxxVoPM wY+fMu/xU9MK9GGDai5fQkvkJOVtFyLIKxCk/Zzy32ayCLBHhMQMxC2XwHIkKTVWqXM+ GQH6+VP97CZJ9OyFFjNnZhwMFa0FJYWJ5sR9L5y3bittuR1vRqfcL84LFvJ1KpGpkj8l UI0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722524391; x=1723129191; h=content-transfer-encoding:mime-version: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=Foeh4pNUusBj9Qtq8099vs8YdJxJ49vk/2pRY7HvNCQ=; b=X3ZDDCjpKgCSn/QV5kcelgn/ezKgUSXjhUUq3RTcnLVX7kxwapj4fY8jQeDKly6iSI 0sVnjH0QXVTaTyYnHrz4CCGZ14Z9HyksPRG+cZEXfIOg4IsbYVPUYHpEN/OKmnNG+vBb O6RqD6Ika+Dygj7CzrvCk2x60Sy+G6P9+MWe2Cvqpnj8HSfed3gGnHBfm9DZ2QVPnZlC Dyi+Kgt/E0lpFGJyMZk79PE/s/WhlfjteTn8Vp8B2WuIoZaTSMjkvaO8/wQKJRK7wXtj bZIjytOrrH1nRx1HWXdsydrN5VxCIrjmKkXurnP8MU0o+NbrrftM02kSSSt+vJdd92GS KIwA== X-Gm-Message-State: AOJu0Yzj1ubN0n2Limjm/5ul2gujgzMxtunnBqNGJlEPfumTrK2p0pQP vB2RY+QSQ8km6XiNw8Wlr9WU7aFklzqj6HgYYlig0MrXenZECkNqcoHdTlXkVQuLBvAK8tP3QQK P5y5W X-Google-Smtp-Source: AGHT+IH5dBgm8r3qSpXmhNNeQLV0Uqq96uFxj2Z7SrkZYXhwPIDGyZ8cn6qJYzzdacJrl7H/ahw2aA== X-Received: by 2002:a05:6402:b21:b0:5a3:d140:1a46 with SMTP id 4fb4d7f45d1cf-5b7f56fea54mr420131a12.23.1722524390739; Thu, 01 Aug 2024 07:59:50 -0700 (PDT) Received: from platypus.lan ([2a04:cec2:9:dc84:3622:6733:ff49:ee91]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5ac63590592sm10252456a12.25.2024.08.01.07.59.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Aug 2024 07:59:50 -0700 (PDT) From: Arthur Cohen To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Pierre-Emmanuel Patry Subject: [PATCH 088/125] gccrs: Struct are types, not values Date: Thu, 1 Aug 2024 16:57:24 +0200 Message-ID: <20240801145809.366388-90-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240801145809.366388-2-arthur.cohen@embecosm.com> References: <20240801145809.366388-2-arthur.cohen@embecosm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-14.2 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org From: Pierre-Emmanuel Patry We shall search in the right namespace. The correct namespace for struct is type namespace. gcc/rust/ChangeLog: * typecheck/rust-hir-type-check-item.cc (TypeCheckItem::visit): Change search location for struct types. Signed-off-by: Pierre-Emmanuel Patry --- gcc/rust/typecheck/rust-hir-type-check-item.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gcc/rust/typecheck/rust-hir-type-check-item.cc b/gcc/rust/typecheck/rust-hir-type-check-item.cc index 4ab946e1c2a..3e504e5df32 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-item.cc +++ b/gcc/rust/typecheck/rust-hir-type-check-item.cc @@ -279,9 +279,11 @@ TypeCheckItem::visit (HIR::StructStruct &struct_decl) { auto nr_ctx = Resolver2_0::ImmutableNameResolutionContext::get ().resolver (); - auto canonical_path = nr_ctx.values.to_canonical_path ( + auto canonical_path = nr_ctx.types.to_canonical_path ( struct_decl.get_mappings ().get_nodeid ()); + if (!canonical_path.has_value ()) + rust_unreachable (); path = canonical_path.value (); } else