From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by sourceware.org (Postfix) with ESMTPS id C96133857C51 for ; Tue, 30 Jan 2024 12:11:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C96133857C51 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 C96133857C51 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::430 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616697; cv=none; b=wznXlY7Gv+LTBre+ujiVJG3juymQGXQ0nUb5C+WDTRXaiNDfbuWa2H/RXgku3+B/zJWtqcGVclQ3eaJPVNXgYheAy8oI7UGjGVCY7D66Lxa+KcmyZALenwx4y6Sx0v8QAvFSRdMYuaUDjq+gFkbsE/DQjMi4OMrJa4elffi21aE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616697; c=relaxed/simple; bh=6+cvX1FW/q4w9tvSbDu91h2Iu9usQhm1OMmqMulsuh8=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Cu3bIhjEsXfB/ZmZS8h3AhF9FDAwo5/DrJR78Ze6845jakLQFCoTlaBjv3gRMX4chDOlhhRFIp5cp9B8kuKklwrJrq06cCM3ycPGNGn5LCrOghuQhck5uN1Zf+fW7fw3a/fa/JPnjG0uCDBRKdb/LxHsxtUhrLRLYg1wfmd5xd8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-33af3c7ef60so1152045f8f.0 for ; Tue, 30 Jan 2024 04:11:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1706616676; x=1707221476; 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=EGxTRYG800KL4c+ppg1YlWIolB7MsdY7NmOX8ir/pbU=; b=EOEx1cxK10ADFSalPBhymTXhjUrPfX+DyIgtZc8SzeMbtFONNokiYkfMI87U+GvlHE ZeRoMT3KUGWa3SNcz0KdW4wL4xE/JhkciDWz3nw9riZ/wv/LAyAuSah3Kas6Ao8q3dI3 DcWUvDbCk8FpAkcCumrjXS+Sl8mnFpLtYMNVF6xetylzhThF3uakvuTGyS5JI1l6TQtW zOu/9jCwJSUFXHTM/ZLoI1saiHkA9eLj11QWbMZIkwUuAy9wvgB1az8Kk5zt0Ff4paBs ovqzajzeMZLUcd/3SbWpRhpEUsOK/QRl5Nt4L7Gr7Ncrf2IGeZmb1Jvlgkj5uU3AcHpU 2iFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706616676; x=1707221476; 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=EGxTRYG800KL4c+ppg1YlWIolB7MsdY7NmOX8ir/pbU=; b=NV0Ti+gOF6VQajylTthf3leAvFue0/2SyN+AHEAS/AJBPv4neCChXpwSi3F0ySVOyy UHKaO0/i8yhDme9kb8gAVISMAHsssJRlPMiqzUISR98omS9BOr4OPxvge14UlIUGfkvx WWyYfY4AKva/DS97MRcTtiLlza8RVJ5QMdfu0k0PagjVeCcaZnf7rWyf1tzFsg8QOjen XSpkii6KsqdsDNxrkTTG3Ifd72N9YJ6NVzDqVVQENAcn+mFvNxBa6zbabVs14q5c+tLw reQPHrjZmV5gBnGWmBpkNe15t6FDR3lWCMEIQZRFEfMNWm7qZsH3WkNJcxClREjh4v/f zb8w== X-Gm-Message-State: AOJu0YzeYtDsHgI2lx9D/5PnDOZ4Y2KGci9t5zOcgkXjfhxNTeWkhA9i fSRhxQzYDHzL0Mq0FobKARffOZLpIMHEGd4jgIxl9VoKQca9eQb6B8yA0Yv0x5G7qW0cKW+QVDo QtA== X-Google-Smtp-Source: AGHT+IEr5L3eON55d0LZXr9iEdGN6ed4yG9jK8+LyjX61ancCChBzUGuku0Km8YKkabzD4+3jHq0GQ== X-Received: by 2002:a5d:62cc:0:b0:33a:f4b4:8023 with SMTP id o12-20020a5d62cc000000b0033af4b48023mr3157339wrv.7.1706616676686; Tue, 30 Jan 2024 04:11:16 -0800 (PST) Received: from platypus.localdomain ([62.23.166.218]) by smtp.gmail.com with ESMTPSA id f9-20020a056000036900b00339307d9d31sm10569894wrf.112.2024.01.30.04.11.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 04:11:16 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Arthur Cohen Subject: [COMMITTED 036/101] gccrs: nr2.0: Store mappings in NameResolutionContext Date: Tue, 30 Jan 2024 13:06:52 +0100 Message-ID: <20240130121026.807464-39-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-name-resolution-context.h: Store a reference to the mappings. * resolve/rust-name-resolution-context.cc (NameResolutionContext::NameResolutionContext): Likewise. --- gcc/rust/resolve/rust-name-resolution-context.cc | 4 ++++ gcc/rust/resolve/rust-name-resolution-context.h | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/gcc/rust/resolve/rust-name-resolution-context.cc b/gcc/rust/resolve/rust-name-resolution-context.cc index 82771cdd923..8bb7a9a15c1 100644 --- a/gcc/rust/resolve/rust-name-resolution-context.cc +++ b/gcc/rust/resolve/rust-name-resolution-context.cc @@ -21,6 +21,10 @@ namespace Rust { namespace Resolver2_0 { +NameResolutionContext::NameResolutionContext () + : mappings (*Analysis::Mappings::get ()) +{} + tl::expected NameResolutionContext::insert (Identifier name, NodeId id, Namespace ns) { diff --git a/gcc/rust/resolve/rust-name-resolution-context.h b/gcc/rust/resolve/rust-name-resolution-context.h index 6d14be35986..d63ee33378b 100644 --- a/gcc/rust/resolve/rust-name-resolution-context.h +++ b/gcc/rust/resolve/rust-name-resolution-context.h @@ -21,6 +21,7 @@ #include "optional.h" #include "rust-forever-stack.h" +#include "rust-hir-map.h" namespace Rust { namespace Resolver2_0 { @@ -136,6 +137,8 @@ correct class NameResolutionContext { public: + NameResolutionContext (); + /** * Insert a new value in the current rib. * @@ -174,6 +177,8 @@ public: ForeverStack types; ForeverStack macros; ForeverStack labels; + + Analysis::Mappings &mappings; }; } // namespace Resolver2_0 -- 2.42.1