From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by sourceware.org (Postfix) with ESMTPS id 443BC38582BA for ; Tue, 30 Jan 2024 12:10:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 443BC38582BA 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 443BC38582BA Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::42d 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-wr1-x42d.google.com with SMTP id ffacd0b85a97d-33ae3be1c37so1526555f8f.0 for ; Tue, 30 Jan 2024 04:10:57 -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=lmuPzX61JxUj+5VlOleKytJcDWDPe32lgP6EIitfFGel9fbPvaN9r+Vdd8+LfdCBXj yxdJK7c3DMm/oO1iDGsZxzbapBntTov7PZCXhhNB+Ir1rSyieiqXHaDQjmTME/6wNq3p LySwLuO1vFlcv0zpVSRwvCuis0OAMv86nvr/i1I+rUPZMSgZlzlxtK2uuxU0DnPKz+kT fZ8heO4E10IydZ2fvdHtVvijvFdUkUpyYf4C1K7NZIzfFzV60pl68drk8xBONmuqwO/y mHVKsxx6dlJe35aiFym1B3iIabT6CYZx6SPkM6XjAUTpzhxza/soA3FxkZydYjDgkyz9 gxcQ== X-Gm-Message-State: AOJu0YzCclkIb860Pyf+Ek+SiAMzuWLs6tfzmz73XmrhOtlDtSYBghaF k2+JAnBpAs8tWR6XbqgA/EWiOJG14NfFPoVQ29Qoo8qZfa5VRZU2PX0FzBu7BdmkSVdUqYrn+95 ucg== 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> 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: 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 -- 2.42.1