2 files changed, 44 insertions, 0 deletions
diff --git a/gcc/rust/util/rust-hir-map.cc b/gcc/rust/util/rust-hir-map.cc
index f9932a4..c21b681 100644
--- a/gcc/rust/util/rust-hir-map.cc
+++ b/gcc/rust/util/rust-hir-map.cc
@@ -201,6 +201,18 @@ Mappings::get_hir_crate (CrateNum crateNum)
   return it->second;
 }
 
+bool
+Mappings::is_local_hirid_crate (HirId crateNum)
+{
+  for (const auto &it : hirCrateMappings)
+    {
+      const HIR::Crate *crate = it.second;
+      if (crate->get_mappings ().get_hirid () == crateNum)
+	return true;
+    }
+  return false;
+}
+
 void
 Mappings::insert_hir_crate (HIR::Crate *crate)
 {
@@ -208,6 +220,9 @@ Mappings::insert_hir_crate (HIR::Crate *crate)
   rust_assert (get_hir_crate (crateNum) == nullptr);
 
   hirCrateMappings[crateNum] = crate;
+  insert_node_to_hir (crate->get_mappings ().get_crate_num (),
+		      crate->get_mappings ().get_nodeid (),
+		      crate->get_mappings ().get_hirid ());
 }
 
 void
@@ -908,6 +923,25 @@ Mappings::lookup_module_chidren_items (NodeId module)
   return Optional<std::vector<Resolver::CanonicalPath> &>::some (it->second);
 }
 
+Optional<Resolver::CanonicalPath &>
+Mappings::lookup_module_child (NodeId module, const std::string &item_name)
+{
+  Optional<std::vector<Resolver::CanonicalPath> &> children
+    = lookup_module_chidren_items (module);
+  if (children.is_none ())
+    return Optional<Resolver::CanonicalPath &>::none ();
+
+  // lookup the children to match the name if we can
+  for (auto &child : children.get ())
+    {
+      const std::string &raw_identifier = child.get ();
+      bool found = raw_identifier.compare (item_name) == 0;
+      if (found)
+	return Optional<Resolver::CanonicalPath &>::some (child);
+    }
+  return Optional<Resolver::CanonicalPath &>::none ();
+}
+
 void
 Mappings::insert_child_item_to_parent_module_mapping (NodeId child_item,
 						      NodeId parent_module)
@@ -925,5 +959,11 @@ Mappings::lookup_parent_module (NodeId child_item)
   return Optional<NodeId>::some (it->second);
 }
 
+bool
+Mappings::node_is_module (NodeId query)
+{
+  return module_child_items.find (query) != module_child_items.end ();
+}
+
 } // namespace Analysis
 } // namespace Rust
diff --git a/gcc/rust/util/rust-hir-map.h b/gcc/rust/util/rust-hir-map.h
index a48d4be..4360ae2 100644
--- a/gcc/rust/util/rust-hir-map.h
+++ b/gcc/rust/util/rust-hir-map.h
@@ -122,6 +122,7 @@ public:
   void insert_ast_crate (AST::Crate *crate);
 
   HIR::Crate *get_hir_crate (CrateNum crateNum);
+  bool is_local_hirid_crate (HirId crateNum);
   void insert_hir_crate (HIR::Crate *crate);
 
   void insert_defid_mapping (DefId id, HIR::Item *item);
@@ -329,10 +330,13 @@ public:
   void insert_module_child_item (NodeId module, Resolver::CanonicalPath item);
   Optional<std::vector<Resolver::CanonicalPath> &>
   lookup_module_chidren_items (NodeId module);
+  Optional<Resolver::CanonicalPath &>
+  lookup_module_child (NodeId module, const std::string &item_name);
 
   void insert_child_item_to_parent_module_mapping (NodeId child_item,
 						   NodeId parent_module);
   Optional<NodeId> lookup_parent_module (NodeId child_item);
+  bool node_is_module (NodeId query);
 
 private:
   Mappings ();