{"id":2223268,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2223268/?format=json","web_url":"http://patchwork.ozlabs.org/project/gcc/patch/20260414231905.191063-7-arthur.cohen@embecosm.com/","project":{"id":17,"url":"http://patchwork.ozlabs.org/api/1.1/projects/17/?format=json","name":"GNU Compiler Collection","link_name":"gcc","list_id":"gcc-patches.gcc.gnu.org","list_email":"gcc-patches@gcc.gnu.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<20260414231905.191063-7-arthur.cohen@embecosm.com>","date":"2026-04-14T23:18:28","name":"[COMMITTED,07/43] gccrs: Add enum items to value namespace as well","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"310a2507b8622e859cb945e42dd001ef50b1d8b5","submitter":{"id":83476,"url":"http://patchwork.ozlabs.org/api/1.1/people/83476/?format=json","name":"Arthur Cohen","email":"arthur.cohen@embecosm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/gcc/patch/20260414231905.191063-7-arthur.cohen@embecosm.com/mbox/","series":[{"id":499900,"url":"http://patchwork.ozlabs.org/api/1.1/series/499900/?format=json","web_url":"http://patchwork.ozlabs.org/project/gcc/list/?series=499900","date":"2026-04-14T23:18:24","name":"[COMMITTED,01/43] gccrs: testsuite:Add a testcase for setup_associated_types","version":1,"mbox":"http://patchwork.ozlabs.org/series/499900/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2223268/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2223268/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":["incoming@patchwork.ozlabs.org","gcc-patches@gcc.gnu.org"],"Delivered-To":["patchwork-incoming@legolas.ozlabs.org","gcc-patches@gcc.gnu.org"],"Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=embecosm.com header.i=@embecosm.com header.a=rsa-sha256\n header.s=google header.b=NrbFx09t;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org\n (client-ip=38.145.34.32; helo=vm01.sourceware.org;\n envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org;\n receiver=patchwork.ozlabs.org)","sourceware.org;\n\tdkim=pass (2048-bit key,\n unprotected) header.d=embecosm.com header.i=@embecosm.com header.a=rsa-sha256\n header.s=google header.b=NrbFx09t","sourceware.org;\n dmarc=none (p=none dis=none) header.from=embecosm.com","sourceware.org; spf=pass smtp.mailfrom=embecosm.com","server2.sourceware.org;\n arc=none smtp.remote-ip=209.85.128.67"],"Received":["from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fwKqr56Rgz1yHM\n\tfor ; Wed, 15 Apr 2026 09:15:04 +1000 (AEST)","from vm01.sourceware.org (localhost [127.0.0.1])\n\tby sourceware.org (Postfix) with ESMTP id BB1C94BA23E1\n\tfor ; Tue, 14 Apr 2026 23:15:02 +0000 (GMT)","from mail-wm1-f67.google.com (mail-wm1-f67.google.com\n [209.85.128.67])\n by sourceware.org (Postfix) with ESMTPS id 5A3924BA2E10\n for ; Tue, 14 Apr 2026 23:14:20 +0000 (GMT)","by mail-wm1-f67.google.com with SMTP id\n 5b1f17b1804b1-4838c15e3cbso57684155e9.3\n for ; Tue, 14 Apr 2026 16:14:20 -0700 (PDT)","from platypus.localdomain (176-147-231-59.abo.bbox.fr.\n [176.147.231.59]) by smtp.gmail.com with ESMTPSA id\n 5b1f17b1804b1-488f1dd8806sm3325945e9.3.2026.04.14.16.14.17\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Tue, 14 Apr 2026 16:14:17 -0700 (PDT)"],"DKIM-Filter":["OpenDKIM Filter v2.11.0 sourceware.org BB1C94BA23E1","OpenDKIM Filter v2.11.0 sourceware.org 5A3924BA2E10"],"DMARC-Filter":"OpenDMARC Filter v1.4.2 sourceware.org 5A3924BA2E10","ARC-Filter":"OpenARC Filter v1.0.0 sourceware.org 5A3924BA2E10","ARC-Seal":"i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1776208460; cv=none;\n b=doVHM6EMbYIfZIhO3ytVkZ/FxG/xKSHb4IA3y1NqHn4rg/UkEA8auTHBwsrkQY2Do08irrV1m8WDGE0JYPya5Zlo7wQkqV8ifp0nYWwusfSR12RGQMBphqZ31o1UPTiv03sMJDJJ75CgNIznbJEdrzbbUy5htVSvjKg47E1AhEM=","ARC-Message-Signature":"i=1; a=rsa-sha256; d=sourceware.org; s=key;\n t=1776208460; c=relaxed/simple;\n bh=2qH52eObAUu1gTPhqWy/IpboBINu73X2/wVCNfCddKU=;\n h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version;\n b=wYIsQuQOK8RJ/jDccbg558LO/7JCH9iKLMlR3J5NTRjh+f4fOz/7TzmBiswvNhrTtgroGhd78+EmO1yaWwKoB4G3gN+VGyGAJe+QaPwAtgYL4YbSN79QB8BZZhvzV/0ZkKNnGzLfZQGS7bY1aGTPzFaTrv3Htpll9WdV1EO5qjw=","ARC-Authentication-Results":"i=1; server2.sourceware.org","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=embecosm.com; s=google; t=1776208459; x=1776813259; darn=gcc.gnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=nioNEk6fEeD4QDOssSeITQR4ZUamOBxpW8yd3w6zPb4=;\n b=NrbFx09tc50Yx0rG+SJwXOBaMZTxmM6AtBqoZl/OzQCwXi7MuGkiqHg7vs29HKweDx\n 9Mlh7WYHy5aeqISzKFaimHU4aS1Qtpqgpdp766/aftMIzsjs+yp72WV0Ebz1Hpp2PAHN\n kOfRoZEPwMIbudRiUUgRrAhQY1h7skugW0he4ulOaexbVKwHCYVwBxW9ZVyzsdvehC2u\n KM4t7JCr7osPS2ev64n07djoU4YulTCUXThMznftXTCc8TuYvw19YMJI/D6KIn2E/V1h\n iUdbfzMDpQlt57jm1RZ7l38fGLDps1oVl9uWv1pvAN5A5V1259iu784tfTFwkT8FhbUl\n sANA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1776208459; x=1776813259;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=nioNEk6fEeD4QDOssSeITQR4ZUamOBxpW8yd3w6zPb4=;\n b=lEc6Ga6/D2ijNfJt6ensFa1WNz0gtBr3koc2oHuVFpMoKQUY0O879ahLYZvarUTMwM\n G1pUiXufKUAkmJQa32eSg8VETT9di5K2OMAOniFceKJ1JtFIINJd93UBeeIoamNyOFuA\n vtHwrT8eUAUgxUNKdptZolkBRF3yrHOC9/FCu1absgAcho3fEhFeSGRn06StEsmCjUH6\n zYB+xu/kraZSO/T1G1kYKiZcRZ9Pf8P/2y5HwJnHmw6vbJe7EG0SKHnPpwI5F8tXHBKO\n L2OS7N9NypeqPCDwqgd87RzMzxxS8xosE3VHuUQJuF3LeTd6QAxOBi4qoXny8H7B8exg\n paTA==","X-Gm-Message-State":"AOJu0Yzhawx+uBSnUzwTPyR3YdcpIanf6gj+rXtxxrzjWkf26LQxK/Z4\n PVTNK2dwprlSlQuFqRFBH1F0MX8xwRt1vxKe9o/1wFIj6cPL67xXJzGulR9bygWhOvxHIh0QmdM\n XxcjPZ8kR","X-Gm-Gg":"AeBDietYMy91HoLr2hgJij0dmB7/+3iBEG402iTeuzN2Hvpl+fBh4A138TkWVJSHZRg\n 3D7NzqcHuSH5hmsSNpieru8bAR1jPe4J2AN6ZyGjDhpJHc/LDPsYto4Cr7t9NQGrRpwSDX6eJss\n 9DmCFtpu0qwfokfEx/wm8mlM5yFaDjUbbOU1Ol1NgS1LYMRrRQs0gocz3OlHr2oV8GBX+s0jLkM\n Q6YqZ4Rg9WzoDJ5gD9Pm9tULFYzPK2y1Izz04O2NyhkZh15hWiBq0ak2NUAxB9+mEllwcl20Py3\n FJZIwr4B9+Xdt23/n/ek9nnWUFyD3efpr0+NhOIYPUqXnVrvCoZhJbPdTTry17Uw59WlpS17xGk\n W2LZbWS2WjJrD3PMHqaJGcps8v/mSOwXHz745ODEFmRRXGmlXkfLlurf62Zs4hUyDk7g4xdjG9v\n LQM+TAQfHVb5A2HsBTWtZYtZAzKjOHaD+k9far4A89DZQ5S3W2x6BQO3tD6c6MOumTXfybqgyZs\n 8DWvQ==","X-Received":"by 2002:a05:600c:3b24:b0:488:c078:bfda with SMTP id\n 5b1f17b1804b1-488d688d2a1mr265929225e9.26.1776208458802;\n Tue, 14 Apr 2026 16:14:18 -0700 (PDT)","From":"arthur.cohen@embecosm.com","To":"gcc-patches@gcc.gnu.org","Cc":"gcc-rust@gcc.gnu.org,\n\tOwen Avery ","Subject":"[COMMITTED 07/43] gccrs: Add enum items to value namespace as well","Date":"Wed, 15 Apr 2026 01:18:28 +0200","Message-ID":"<20260414231905.191063-7-arthur.cohen@embecosm.com>","X-Mailer":"git-send-email 2.50.1","In-Reply-To":"<20260414231905.191063-1-arthur.cohen@embecosm.com>","References":"<20260414231905.191063-1-arthur.cohen@embecosm.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-BeenThere":"gcc-patches@gcc.gnu.org","X-Mailman-Version":"2.1.30","Precedence":"list","List-Id":"Gcc-patches mailing list ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org"},"content":"From: Owen Avery \n\ngcc/rust/ChangeLog:\n\n\t* resolve/rust-finalize-imports-2.0.cc\n\t(GlobbingVisitor::visit_enum_container): Conditionally insert\n\tinto value namespace as well.\n\t* resolve/rust-forever-stack.hxx (ForeverStack::insert_variant):\n\tAdd template specialization for value namespace.\n\t* resolve/rust-name-resolution-context.cc\n\t(NameResolutionContext::insert_variant): Allow insertion into\n\tvalue namespace.\n\t* resolve/rust-name-resolution-context.h\n\t(NameResolutionContext::insert_variant): Likewise.\n\t* resolve/rust-toplevel-name-resolver-2.0.cc\n\t(TopLevel::insert_enum_variant_or_error_out): Likewise.\n\t(TopLevel::visit): Use tweaked insert_enum_variant_or_error_out\n\tproperly for all enum item kinds.\n\t* resolve/rust-toplevel-name-resolver-2.0.h\n\t(TopLevel::insert_enum_variant_or_error_out): Tweak function\n\tsignature.\n\nSigned-off-by: Owen Avery \n---\n gcc/rust/resolve/rust-finalize-imports-2.0.cc | 9 +++++++--\n gcc/rust/resolve/rust-forever-stack.hxx | 8 ++++++++\n .../resolve/rust-name-resolution-context.cc | 8 ++++++--\n gcc/rust/resolve/rust-name-resolution-context.h | 4 ++--\n .../resolve/rust-toplevel-name-resolver-2.0.cc | 17 +++++++++--------\n .../resolve/rust-toplevel-name-resolver-2.0.h | 5 +++--\n 6 files changed, 35 insertions(+), 16 deletions(-)","diff":"diff --git a/gcc/rust/resolve/rust-finalize-imports-2.0.cc b/gcc/rust/resolve/rust-finalize-imports-2.0.cc\nindex 5feb4407052..a5bbc5b6cd0 100644\n--- a/gcc/rust/resolve/rust-finalize-imports-2.0.cc\n+++ b/gcc/rust/resolve/rust-finalize-imports-2.0.cc\n@@ -64,8 +64,13 @@ void\n GlobbingVisitor::visit_enum_container (AST::Enum &item)\n {\n for (auto &variant : item.get_variants ())\n- ctx.insert_globbed (variant->get_identifier (), variant->get_node_id (),\n-\t\t\tNamespace::Types);\n+ {\n+ ctx.insert_globbed (variant->get_identifier (), variant->get_node_id (),\n+\t\t\t Namespace::Types);\n+ if (variant->get_enum_item_kind () != AST::EnumItem::Kind::Struct)\n+\tctx.insert_globbed (variant->get_identifier (), variant->get_node_id (),\n+\t\t\t Namespace::Values);\n+ }\n }\n \n void\ndiff --git a/gcc/rust/resolve/rust-forever-stack.hxx b/gcc/rust/resolve/rust-forever-stack.hxx\nindex c7c5c9439e4..e8f4e8449b3 100644\n--- a/gcc/rust/resolve/rust-forever-stack.hxx\n+++ b/gcc/rust/resolve/rust-forever-stack.hxx\n@@ -199,6 +199,14 @@ ForeverStack::insert_variant (Identifier name, NodeId node)\n \t\t Rib::Definition::NonShadowable (node, true));\n }\n \n+template <>\n+inline tl::expected\n+ForeverStack::insert_variant (Identifier name, NodeId node)\n+{\n+ return insert_inner (peek (), name.as_string (),\n+\t\t Rib::Definition::NonShadowable (node, true));\n+}\n+\n template \n inline void\n ForeverStack::insert_lang_prelude (Identifier name, NodeId id)\ndiff --git a/gcc/rust/resolve/rust-name-resolution-context.cc b/gcc/rust/resolve/rust-name-resolution-context.cc\nindex 45b78cb899f..bbd8f07dd7b 100644\n--- a/gcc/rust/resolve/rust-name-resolution-context.cc\n+++ b/gcc/rust/resolve/rust-name-resolution-context.cc\n@@ -207,9 +207,13 @@ NameResolutionContext::insert (Identifier name, NodeId id, Namespace ns)\n }\n \n tl::expected\n-NameResolutionContext::insert_variant (Identifier name, NodeId id)\n+NameResolutionContext::insert_variant (Identifier name, NodeId id,\n+\t\t\t\t bool is_also_value)\n {\n- return types.insert_variant (name, id);\n+ auto res = types.insert_variant (name, id);\n+ if (res.has_value () && is_also_value)\n+ res = values.insert_variant (name, id);\n+ return res;\n }\n \n tl::expected\ndiff --git a/gcc/rust/resolve/rust-name-resolution-context.h b/gcc/rust/resolve/rust-name-resolution-context.h\nindex 91eb0dcde75..eac38eb62d6 100644\n--- a/gcc/rust/resolve/rust-name-resolution-context.h\n+++ b/gcc/rust/resolve/rust-name-resolution-context.h\n@@ -473,8 +473,8 @@ public:\n tl::expected insert (Identifier name, NodeId id,\n \t\t\t\t\t\t Namespace ns);\n \n- tl::expected insert_variant (Identifier name,\n-\t\t\t\t\t\t\t NodeId id);\n+ tl::expected\n+ insert_variant (Identifier name, NodeId id, bool is_also_value);\n \n tl::expected\n insert_shadowable (Identifier name, NodeId id, Namespace ns);\ndiff --git a/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc b/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc\nindex 67a8c52d1de..2002df54596 100644\n--- a/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc\n+++ b/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc\n@@ -33,10 +33,10 @@ TopLevel::TopLevel (NameResolutionContext &resolver)\n template \n void\n TopLevel::insert_enum_variant_or_error_out (const Identifier &identifier,\n-\t\t\t\t\t const T &node)\n+\t\t\t\t\t const T &node, bool is_also_value)\n {\n insert_enum_variant_or_error_out (identifier, node.get_locus (),\n-\t\t\t\t node.get_node_id ());\n+\t\t\t\t node.get_node_id (), is_also_value);\n }\n \n void\n@@ -58,12 +58,13 @@ TopLevel::check_multiple_insertion_error (\n void\n TopLevel::insert_enum_variant_or_error_out (const Identifier &identifier,\n \t\t\t\t\t const location_t &locus,\n-\t\t\t\t\t const NodeId node_id)\n+\t\t\t\t\t const NodeId node_id,\n+\t\t\t\t\t bool is_also_value)\n {\n // keep track of each node's location to provide useful errors\n node_locations.emplace (node_id, locus);\n \n- auto result = ctx.insert_variant (identifier, node_id);\n+ auto result = ctx.insert_variant (identifier, node_id, is_also_value);\n check_multiple_insertion_error (result, identifier, locus, node_id);\n }\n \n@@ -309,7 +310,7 @@ TopLevel::visit (AST::TupleStruct &tuple_struct)\n void\n TopLevel::visit (AST::EnumItem &variant)\n {\n- insert_enum_variant_or_error_out (variant.get_identifier (), variant);\n+ insert_enum_variant_or_error_out (variant.get_identifier (), variant, true);\n \n DefaultResolver::visit (variant);\n }\n@@ -317,7 +318,7 @@ TopLevel::visit (AST::EnumItem &variant)\n void\n TopLevel::visit (AST::EnumItemTuple &variant)\n {\n- insert_enum_variant_or_error_out (variant.get_identifier (), variant);\n+ insert_enum_variant_or_error_out (variant.get_identifier (), variant, true);\n \n DefaultResolver::visit (variant);\n }\n@@ -325,7 +326,7 @@ TopLevel::visit (AST::EnumItemTuple &variant)\n void\n TopLevel::visit (AST::EnumItemStruct &variant)\n {\n- insert_enum_variant_or_error_out (variant.get_identifier (), variant);\n+ insert_enum_variant_or_error_out (variant.get_identifier (), variant, false);\n \n DefaultResolver::visit (variant);\n }\n@@ -333,7 +334,7 @@ TopLevel::visit (AST::EnumItemStruct &variant)\n void\n TopLevel::visit (AST::EnumItemDiscriminant &variant)\n {\n- insert_or_error_out (variant.get_identifier (), variant, Namespace::Types);\n+ insert_enum_variant_or_error_out (variant.get_identifier (), variant, true);\n \n DefaultResolver::visit (variant);\n }\ndiff --git a/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.h b/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.h\nindex b5b0c8b1982..bcee6c2c1cf 100644\n--- a/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.h\n+++ b/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.h\n@@ -142,11 +142,12 @@ public:\n \n template \n void insert_enum_variant_or_error_out (const Identifier &identifier,\n-\t\t\t\t\t const T &node);\n+\t\t\t\t\t const T &node, bool is_also_value);\n \n void insert_enum_variant_or_error_out (const Identifier &identifier,\n \t\t\t\t\t const location_t &locus,\n-\t\t\t\t\t const NodeId node_id);\n+\t\t\t\t\t const NodeId node_id,\n+\t\t\t\t\t bool is_also_value);\n \n private:\n // If a new export has been defined whilst visiting the visitor is considered\n","prefixes":["COMMITTED","07/43"]}