From patchwork Tue Jan 30 12:06: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: 1892832 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=CydJG1+A; 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 4TPPWR6bPRz23fD for ; Tue, 30 Jan 2024 23:25:07 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E9E27385E008 for ; Tue, 30 Jan 2024 12:25:05 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 73703385801F for ; Tue, 30 Jan 2024 12:10:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 73703385801F 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 73703385801F 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=1706616661; cv=none; b=V8hASwXbh8paXB5vmU8hGGn3JAfbSNXj+EbNwys6byvBmojqyn2pcgskuWoCMkfEvkfVCzzLGjqQ8grnerr5eoJYnSzCLO44xKL5ENmy7ud4JD7qTHkOoSjVZWOWVS326NAP8ICeDcB1k7kvcNfscv9ogC1HgPmODSLU6RW9YF8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616661; c=relaxed/simple; bh=7ndiFrcraf9h3eHC9XJgGgR+8NJKjQnZTgkfmkovmAk=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=QrE0vupf7eZQsehO6W8rpSII/PLrDxd2dHCzdy/7fkLxxIuhx6ppKa+kxaY6urkaIfFOCfrP7UkIFAKHYsiBE7tWcm9lUaP9Zs5MDJyRjbXxJArrcUpgIMSqJs93MMSCoPhTaa2ksl/cUlOwC0A2u9qQKhlonoE+pf8N+Kx3q3A= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-40faf6788d1so1638055e9.0 for ; Tue, 30 Jan 2024 04:10:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1706616656; x=1707221456; 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=SM5FPqGsTqK4mDPcsmuBGQtDBFibXUOYX8m/x89exW8=; b=CydJG1+A6stsU+QTMlshTSksgsE5FJkIQ2hEcYl8taHEr5TQCEj0N/DoEZud1HLmpQ UlKgj0WwWPE45GyBRomYojOrZycpY0TiDeYJCGHARxw2tLrN8xkHG1K/yO7Ea6cNnB3M osKGNjVa56b6QLxt5l2CDFV1vX9j4i9G+KqejHwQ2SXlNXdSRCNthtsysV7gGSxWyNiK xeFh3L7T3R0Z6rpzAFjMkTDmklYjGleUYiU7TjppubuZwAdNk4WJ4iSH81ToJHWxCTl2 Zrrc6Mg1Oso2bKvgvB3wLCL0e1IeuYEQde9pyKXo8+O3U9TsSS/tKkBf+MRmEOZvR4JF Y/lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706616656; x=1707221456; 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=SM5FPqGsTqK4mDPcsmuBGQtDBFibXUOYX8m/x89exW8=; b=frVuJdSY2IvzZxkdeJlfewzL2NRE8Bs8jm1QOtPbRZyswda3EgeSGjrhxbq3QdE4r7 D/kJvrhKQFVYfG2B8KrOxpEjURGJovYMDDxGYLQg0jKw5CctEgwbsuTmHyfY2H6rywZ1 bpwW90xEH5eDrVXoJ/2J7HTbD5o12dkNoeKEZrbU5Nc/uQ26yIz9eoMYgxVb+fElY7Az F2bpyIx1hRwqX7WfdOiiRKaRfzPQqVyWpWvMtoYhVugEUVk6+tGOaftHO7QtzJdLM/pj xH4TpFY1dkT9dQUSmODkscpkSPkVAAgSWtThQnugc/6C9r4M5rDWvH31Au1ri5lMSd7A K1Rw== X-Gm-Message-State: AOJu0YzHn9bNnpwauUCE0kkfkv1hLaKhdZCMwuO5F62QGL8dQAcoXs5b f5ygoOVglKXYuOzq7QB3vuOZhGXOVtW+bTH6Jhy8T3waJ9EFv9dBsFFADW8TPD9EwvOZZQlcDZv Nmg== X-Google-Smtp-Source: AGHT+IEpcFeNdpEIcWqv+ouwAj5QcMUxglk7AIWVGRQgR7B05O3SypPhLsJSCrZureXRrJeqfx4fwA== X-Received: by 2002:adf:f851:0:b0:336:c79d:7504 with SMTP id d17-20020adff851000000b00336c79d7504mr1437797wrq.2.1706616656129; Tue, 30 Jan 2024 04:10:56 -0800 (PST) Received: from platypus.localdomain ([62.23.166.218]) by smtp.gmail.com with ESMTPSA id f9-20020a056000036900b00339307d9d31sm10569894wrf.112.2024.01.30.04.10.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 04:10:55 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Arthur Cohen Subject: [COMMITTED 009/101] gccrs: foreverstack: Specialize `get` for Namespace::Labels Date: Tue, 30 Jan 2024 13:06:25 +0100 Message-ID: <20240130121026.807464-12-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20240130121026.807464-2-arthur.cohen@embecosm.com> References: <20240130121026.807464-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=unavailable 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: Arthur Cohen gcc/rust/ChangeLog: * resolve/rust-forever-stack.hxx: Add specific behavior for `ForeverStack::get` when dealing with labels. --- gcc/rust/resolve/rust-forever-stack.hxx | 29 ++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/gcc/rust/resolve/rust-forever-stack.hxx b/gcc/rust/resolve/rust-forever-stack.hxx index 806745eb908..211979fa9b9 100644 --- a/gcc/rust/resolve/rust-forever-stack.hxx +++ b/gcc/rust/resolve/rust-forever-stack.hxx @@ -208,7 +208,7 @@ ForeverStack::update_cursor (Node &new_cursor) } template -inline tl::optional +tl::optional ForeverStack::get (const Identifier &name) { tl::optional resolved_node = tl::nullopt; @@ -234,6 +234,33 @@ ForeverStack::get (const Identifier &name) return resolved_node; } +template <> +tl::optional inline ForeverStack::get ( + const Identifier &name) +{ + tl::optional resolved_node = tl::nullopt; + + reverse_iter ([&resolved_node, &name] (Node ¤t) { + // looking up for labels cannot go through function ribs + // TODO: What other ribs? + if (current.rib.kind == Rib::Kind::Function) + return KeepGoing::No; + + auto candidate = current.rib.get (name.as_string ()); + + // FIXME: Factor this in a function with the generic `get` + return candidate.map_or ( + [&resolved_node] (NodeId found) { + resolved_node = found; + + return KeepGoing::No; + }, + KeepGoing::Yes); + }); + + return resolved_node; +} + /* Check if an iterator points to the last element */ template static bool