From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <tschwinge@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1643)
 id 5AF2F381A7C1; Wed,  8 Jun 2022 12:38:18 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5AF2F381A7C1
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Thomas Schwinge <tschwinge@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc/devel/rust/master] mappings: Add mappings for
 SimplePath{Segment}s
X-Act-Checkin: gcc
X-Git-Author: Arthur Cohen <arthur.cohen@embecosm.com>
X-Git-Refname: refs/heads/devel/rust/master
X-Git-Oldrev: ab845217887468b500b624f0837023122002c534
X-Git-Newrev: 6f07a7689284a89d25a6e236193fca0b06f8e82e
Message-Id: <20220608123818.5AF2F381A7C1@sourceware.org>
Date: Wed,  8 Jun 2022 12:38:18 +0000 (GMT)
X-BeenThere: gcc-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-cvs mailing list <gcc-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-cvs/>
List-Help: <mailto:gcc-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Jun 2022 12:38:18 -0000

https://gcc.gnu.org/g:6f07a7689284a89d25a6e236193fca0b06f8e82e

commit 6f07a7689284a89d25a6e236193fca0b06f8e82e
Author: Arthur Cohen <arthur.cohen@embecosm.com>
Date:   Tue Apr 26 14:36:55 2022 +0200

    mappings: Add mappings for SimplePath{Segment}s

Diff:
---
 gcc/rust/util/rust-hir-map.cc | 50 +++++++++++++++++++++++++++++++++++++++++++
 gcc/rust/util/rust-hir-map.h  | 11 ++++++++++
 2 files changed, 61 insertions(+)

diff --git a/gcc/rust/util/rust-hir-map.cc b/gcc/rust/util/rust-hir-map.cc
index ac1cf7042a9..4062ce7e4e2 100644
--- a/gcc/rust/util/rust-hir-map.cc
+++ b/gcc/rust/util/rust-hir-map.cc
@@ -426,6 +426,56 @@ Mappings::lookup_hir_path_expr_seg (CrateNum crateNum, HirId id)
   return iy->second;
 }
 
+void
+Mappings::insert_simple_path_segment (CrateNum crateNum, HirId id,
+				      AST::SimplePathSegment *path)
+{
+  rust_assert (lookup_simple_path_segment (crateNum, id) == nullptr);
+
+  astSimplePathSegmentMappings[crateNum][id] = path;
+  nodeIdToHirMappings[crateNum][path->get_node_id ()] = id;
+  insert_location (crateNum, id, path->get_locus ());
+}
+
+AST::SimplePathSegment *
+Mappings::lookup_simple_path_segment (CrateNum crateNum, HirId id)
+{
+  auto it = astSimplePathSegmentMappings.find (crateNum);
+  if (it == astSimplePathSegmentMappings.end ())
+    return nullptr;
+
+  auto iy = it->second.find (id);
+  if (iy == it->second.end ())
+    return nullptr;
+
+  return iy->second;
+}
+
+void
+Mappings::insert_simple_path (CrateNum crateNum, HirId id,
+			      AST::SimplePath *path)
+{
+  rust_assert (lookup_simple_path (crateNum, id) == nullptr);
+
+  astSimplePathMappings[crateNum][id] = path;
+  nodeIdToHirMappings[crateNum][path->get_node_id ()] = id;
+  insert_location (crateNum, id, path->get_locus ());
+}
+
+AST::SimplePath *
+Mappings::lookup_simple_path (CrateNum crateNum, HirId id)
+{
+  auto it = astSimplePathMappings.find (crateNum);
+  if (it == astSimplePathMappings.end ())
+    return nullptr;
+
+  auto iy = it->second.find (id);
+  if (iy == it->second.end ())
+    return nullptr;
+
+  return iy->second;
+}
+
 void
 Mappings::insert_hir_generic_param (CrateNum crateNum, HirId id,
 				    HIR::GenericParam *param)
diff --git a/gcc/rust/util/rust-hir-map.h b/gcc/rust/util/rust-hir-map.h
index 74fabdf0401..19c2f0aae38 100644
--- a/gcc/rust/util/rust-hir-map.h
+++ b/gcc/rust/util/rust-hir-map.h
@@ -147,6 +147,14 @@ public:
 				 HIR::PathExprSegment *expr);
   HIR::PathExprSegment *lookup_hir_path_expr_seg (CrateNum crateNum, HirId id);
 
+  void insert_simple_path_segment (CrateNum crateNum, HirId id,
+				   AST::SimplePathSegment *path);
+  AST::SimplePathSegment *lookup_simple_path_segment (CrateNum crateNum,
+						      HirId id);
+
+  void insert_simple_path (CrateNum crateNum, HirId id, AST::SimplePath *path);
+  AST::SimplePath *lookup_simple_path (CrateNum crateNum, HirId id);
+
   void insert_hir_generic_param (CrateNum crateNum, HirId id,
 				 HIR::GenericParam *expr);
   HIR::GenericParam *lookup_hir_generic_param (CrateNum crateNum, HirId id);
@@ -330,6 +338,9 @@ private:
   std::map<CrateNum, std::map<HirId, HIR::TraitItem *>> hirTraitItemMappings;
   std::map<CrateNum, std::map<HirId, HIR::ExternalItem *>>
     hirExternItemMappings;
+  std::map<CrateNum, std::map<HirId, AST::SimplePath *>> astSimplePathMappings;
+  std::map<CrateNum, std::map<HirId, AST::SimplePathSegment *>>
+    astSimplePathSegmentMappings;
   std::map<CrateNum, std::map<HirId, HIR::PathExprSegment *>>
     hirPathSegMappings;
   std::map<CrateNum, std::map<HirId, HIR::GenericParam *>>