From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by sourceware.org (Postfix) with ESMTPS id F02F43857039 for ; Fri, 21 Mar 2025 12:34:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F02F43857039 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 F02F43857039 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::332 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742560468; cv=none; b=bERLsRc4SqrV8MecMcQCz5QvYHDzd+WOU6t3jwj9Jwp9BPI23oDnv5PfTuiY8l5X8lXn+J5Na39aJ9fE8O5ORBcdo5lne4xb2zfAVmCF0fgWROyjdw7VB1+1SEAf9P7VDEpoA0Yh2/RxagjCsd1vg+ErCDUo2AX74M9Mj+M84qs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742560468; c=relaxed/simple; bh=ULLzBdp8dOMkRYUBiff0Fl+MTKq3y9tnOgvJE43Mngk=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=SKWFzi8yV7YxlqRY6EdQh7TWebxFwwlMHntw0U46vrintMmFJ1j/Pame4QXncUdtcN5ddx01M+BDqMvvokCkRsfeSFCCobOkAqrQ5+joHoqAcf9jsVBDXDHgk+Nkkq0kXxTGgkPodFNsHfCkwGba2ERze9/s/O+lnAJzW6jyZZA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-43d2d952eb1so14888535e9.1 for ; Fri, 21 Mar 2025 05:34:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1742560418; x=1743165218; 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=nFOAsNNHs31C54voFUBkDn2rowB4p+EPo69HQNChnok=; b=WzLtVXSDNSiG3txSbE/4YCDqniIVvfCBnL6BZRSXPZLf9CKX3t0gTc5MDEPyp5/TSV q+Z/NM1iq5N1CqO/2QcvKLTrtYreoxwJML8qgG2bRHZeMDpJjoESZqSPW21gOQ4AyidB Z7SxItwNZY3QqLlq0SxvhMfFAzHBXyVVu3VCYdJu2YuPad+gmPikwG57SW3XF5jmC0yc 9ANBhpdur7vlSZXGMua8+WZ5XDCLCLsVFapWJftlHuPHcydqGtq7VMTI/XpIMrdX4KQU zz3BAHEfEsnogK66Cd0p7LAsBj9tuEuX41EU6MXNKuPggu/L+rJk3czPFswih4cgEQDq bKIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742560418; x=1743165218; 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=nFOAsNNHs31C54voFUBkDn2rowB4p+EPo69HQNChnok=; b=AbGP6q6fLD/Fm5jzeY+6MGiGIRiBYaP0HTIkgB+VQ5rm9PfWCftqt6ad40RsrUl2Wv IWc5N0WO4+WbDcgrlcYHs7OkLrTDnPeVZMMvscNHxavPBKD+8Q43z+obdZ+owEEZNg64 QCUQJATyyDijq6UpVo4wiOj4AR07muLQnEuJrAmqodOXoK62lw2XLw6tKMNnkzmoyS/w OHV65u1AzI/FLkeqTBvYe8xdnIbXoVTvEMMU9pV6j9ZQNeP7Kc0WnUNKnpL8Y4qd6V6a QebuMgaKO/+ic4cIUjmW4Xi/Ot0KA41BIqS4absQQ7adVGqnn48Q7SSFmopsS0dHiQTc ysoQ== X-Gm-Message-State: AOJu0YwzsztTIvl7hiutFnUUGrs4o5M1UJV/qJEjY4ntPnkLrAKhEHPk mdSdg46SVlnJoDz6DH9NEiyZDNjAp3eZOpXVgEMd9RxeWxxydpIJW81RtE6rJJWORyyQ2FFt42O a0A== X-Gm-Gg: ASbGnctgm9e0BALmGxj6dsm4hPrTaeSD91q6gbvGTNijY5Jfc9eppsocB7UbyUESEVA 4buTUQQYKYbwGf+BlyIN/0a4gOKCnOMEaxAofzVa2SGY4tgY6AdqWh6j+SQTodrtb4jPr7QNG3u D7orHEoYEaSKic6afimuVboMK2fYnWmUEs3CZ3Sa5gkdsdKctG0+xxdxHMcc9PjCvwb7peCZEfK NUK3aNgG6PQMNAmvAjSF1hmnkzUBTH4tdvTYYUh0AI9jqiQ4WmeRii3RC17avUCQG4zO+A3EQD1 2iXjPZIfR9sH8Od932pCyVnjKk9mlnV0ym6SEJyqtozh1+4JYwR2hklG X-Google-Smtp-Source: AGHT+IH/h1flCyNWb6tqIgQ3dVqAtuvxzEA+3zs5en/R/fmZLTkge1M+XTuE11vNhmvuhTR93fLAcw== X-Received: by 2002:a05:6000:2d0a:b0:399:7f44:5c74 with SMTP id ffacd0b85a97d-3997f9389a7mr2455405f8f.55.1742560417748; Fri, 21 Mar 2025 05:33:37 -0700 (PDT) Received: from platypus.lan ([2a04:cec0:1901:7a99:be55:efb3:1ec6:8ea7]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d440ed4d9sm76950305e9.33.2025.03.21.05.33.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Mar 2025 05:33:37 -0700 (PDT) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Arthur Cohen Subject: [COMMITTED 075/146] gccrs: nr2.0: Resolve lang item paths properly. Date: Fri, 21 Mar 2025 13:06:16 +0100 Message-ID: <20250321123226.184882-76-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250321123226.184882-1-arthur.cohen@embecosm.com> References: <20250321123226.184882-1-arthur.cohen@embecosm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-14.4 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 List-Id: From: Arthur Cohen gcc/rust/ChangeLog: * resolve/rust-late-name-resolver-2.0.cc (Late::visit): New. * resolve/rust-late-name-resolver-2.0.h: New. --- .../resolve/rust-late-name-resolver-2.0.cc | 20 +++++++++++++++++++ .../resolve/rust-late-name-resolver-2.0.h | 1 + 2 files changed, 21 insertions(+) diff --git a/gcc/rust/resolve/rust-late-name-resolver-2.0.cc b/gcc/rust/resolve/rust-late-name-resolver-2.0.cc index 3af8496288d..ac5f1c57546 100644 --- a/gcc/rust/resolve/rust-late-name-resolver-2.0.cc +++ b/gcc/rust/resolve/rust-late-name-resolver-2.0.cc @@ -18,6 +18,7 @@ #include "optional.h" #include "rust-ast-full.h" +#include "rust-diagnostics.h" #include "rust-hir-map.h" #include "rust-late-name-resolver-2.0.h" #include "rust-default-resolver.h" @@ -247,6 +248,25 @@ Late::visit (AST::PathInExpression &expr) Definition (resolved->get_node_id ())); } +void +Late::visit (AST::LangItemPath &type) +{ + auto &mappings = Rust::Analysis::Mappings::get (); + auto lang_item = mappings.lookup_lang_item_node (type.get_lang_item_kind ()); + + if (!lang_item) + { + rust_fatal_error ( + type.get_locus (), "use of undeclared lang item %qs", + LangItem::ToString (type.get_lang_item_kind ()).c_str ()); + return; + } + + ctx.map_usage (Usage (type.get_node_id ()), Definition (lang_item.value ())); + + DefaultResolver::visit (type); +} + void Late::visit (AST::TypePath &type) { diff --git a/gcc/rust/resolve/rust-late-name-resolver-2.0.h b/gcc/rust/resolve/rust-late-name-resolver-2.0.h index 79572fbc4fa..6f1191662cc 100644 --- a/gcc/rust/resolve/rust-late-name-resolver-2.0.h +++ b/gcc/rust/resolve/rust-late-name-resolver-2.0.h @@ -46,6 +46,7 @@ public: // resolutions void visit (AST::IdentifierExpr &) override; void visit (AST::PathInExpression &) override; + void visit (AST::LangItemPath &) override; void visit (AST::TypePath &) override; void visit (AST::StructExprStruct &) override; void visit (AST::StructExprStructBase &) override; -- 2.45.2