1 files changed, 31 insertions, 69 deletions

diff --git a/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc b/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc
index 3e5ed53..0930f96 100644
--- a/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc
+++ b/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc
@@ -101,34 +101,11 @@ TopLevel::go (AST::Crate &crate)
 void
 TopLevel::visit (AST::Module &module)
 {
-  insert_or_error_out (module.get_name (), module, Namespace::Types);
-
-  // Parse the module's items if they haven't been expanded and the file
-  // should be parsed (i.e isn't hidden behind an untrue or impossible cfg
-  // directive
-  // TODO: make sure this is right
-  // TODO: avoid loading items if cfg attributes are present?
-  //       might not be needed if this runs after early resolution?
-  // This was copied from the old early resolver method
-  // 'accumulate_escaped_macros'
-  if (module.get_kind () == AST::Module::UNLOADED)
-    {
-      module.load_items ();
-
-      // If the module was previously unloaded, then we don't want to visit it
-      // this time around as the CfgStrip hasn't run on its inner items yet.
-      // Skip it for now, mark the visitor as dirty and try again
-
-      dirty = true;
-
-      return;
-    }
-
   DefaultResolver::visit (module);
 
-  if (Analysis::Mappings::get ().lookup_ast_module (module.get_node_id ())
+  if (Analysis::Mappings::get ().lookup_glob_container (module.get_node_id ())
       == tl::nullopt)
-    Analysis::Mappings::get ().insert_ast_module (&module);
+    Analysis::Mappings::get ().insert_glob_container (&module);
 }
 
 void
@@ -173,19 +150,10 @@ insert_macros (std::vector<PROC_MACRO> &macros, NameResolutionContext &ctx)
 }
 
 void
-TopLevel::visit (AST::ExternCrate &crate)
+TopLevel::visit_extern_crate (AST::ExternCrate &extern_crate, AST::Crate &crate,
+			      CrateNum num)
 {
   auto &mappings = Analysis::Mappings::get ();
-  auto num_opt = mappings.lookup_crate_name (crate.get_referenced_crate ());
-
-  if (!num_opt)
-    {
-      rust_error_at (crate.get_locus (), "unknown crate %qs",
-		     crate.get_referenced_crate ().c_str ());
-      return;
-    }
-
-  CrateNum num = *num_opt;
 
   auto attribute_macros = mappings.lookup_attribute_proc_macros (num);
 
@@ -193,40 +161,27 @@ TopLevel::visit (AST::ExternCrate &crate)
 
   auto derive_macros = mappings.lookup_derive_proc_macros (num);
 
-  auto sub_visitor_1 = [&] () {
-    // TODO: Find a way to keep this part clean without the double dispatch.
-    if (derive_macros.has_value ())
-      {
-	insert_macros (derive_macros.value (), ctx);
-	for (auto &macro : derive_macros.value ())
-	  mappings.insert_derive_proc_macro_def (macro);
-      }
-    if (attribute_macros.has_value ())
-      {
-	insert_macros (attribute_macros.value (), ctx);
-	for (auto &macro : attribute_macros.value ())
-	  mappings.insert_attribute_proc_macro_def (macro);
-      }
-    if (bang_macros.has_value ())
-      {
-	insert_macros (bang_macros.value (), ctx);
-	for (auto &macro : bang_macros.value ())
-	  mappings.insert_bang_proc_macro_def (macro);
-      }
-  };
-
-  auto sub_visitor_2 = [&] () {
-    ctx.canonical_ctx.scope_crate (crate.get_node_id (),
-				   crate.get_referenced_crate (),
-				   std::move (sub_visitor_1));
-  };
+  // TODO: Find a way to keep this part clean without the double dispatch.
+  if (derive_macros.has_value ())
+    {
+      insert_macros (derive_macros.value (), ctx);
+      for (auto &macro : derive_macros.value ())
+	mappings.insert_derive_proc_macro_def (macro);
+    }
+  if (attribute_macros.has_value ())
+    {
+      insert_macros (attribute_macros.value (), ctx);
+      for (auto &macro : attribute_macros.value ())
+	mappings.insert_attribute_proc_macro_def (macro);
+    }
+  if (bang_macros.has_value ())
+    {
+      insert_macros (bang_macros.value (), ctx);
+      for (auto &macro : bang_macros.value ())
+	mappings.insert_bang_proc_macro_def (macro);
+    }
 
-  if (crate.has_as_clause ())
-    ctx.scoped (Rib::Kind::Module, crate.get_node_id (), sub_visitor_2,
-		crate.get_as_clause ());
-  else
-    ctx.scoped (Rib::Kind::Module, crate.get_node_id (), sub_visitor_2,
-		crate.get_referenced_crate ());
+  visit (crate);
 }
 
 static bool
@@ -384,6 +339,13 @@ TopLevel::visit (AST::Enum &enum_item)
 		       Namespace::Types);
 
   DefaultResolver::visit (enum_item);
+
+  // Since enums can be containers for imports, we need to insert them like we
+  // do for modules
+  if (Analysis::Mappings::get ().lookup_glob_container (
+	enum_item.get_node_id ())
+      == tl::nullopt)
+    Analysis::Mappings::get ().insert_glob_container (&enum_item);
 }
 
 void