Merge #1176

1176: Keep `SimplePath{Segment}`s in mappings r=CohenArthur a=CohenArthur

Addresses #1159 

Co-authored-by: Arthur Cohen <arthur.cohen@embecosm.com>

2 files changed, 61 insertions, 0 deletions

diff --git a/gcc/rust/util/rust-hir-map.cc b/gcc/rust/util/rust-hir-map.cc
index ac1cf70..4062ce7 100644
--- a/gcc/rust/util/rust-hir-map.cc
+++ b/gcc/rust/util/rust-hir-map.cc
@@ -427,6 +427,56 @@ Mappings::lookup_hir_path_expr_seg (CrateNum crateNum, HirId id)
 }
 
 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 74fabdf..19c2f0a 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 *>>