Make insert_new_definition permissive of the same mapping.

Definition provide child-parent relation ships within the name scope. This
was used for let stmts such that the let stmt pattern can reference its
parent during type-resolution/code-generation such that we can lookup
the parent mappings for typing etc.

It should be permissive to allow overriding definition mappings when the
definition items are equal. This is important during module name resolution
since it should be able to run the toplevel scan to gather the relevant
names into the top of the scope as well as the relative paths which contain
the same ids within the uppermost scope.

2 files changed, 10 insertions, 2 deletions

diff --git a/gcc/rust/resolve/rust-ast-resolve.cc b/gcc/rust/resolve/rust-ast-resolve.cc
index 06a341a..1b77ae2 100644
--- a/gcc/rust/resolve/rust-ast-resolve.cc
+++ b/gcc/rust/resolve/rust-ast-resolve.cc
@@ -203,8 +203,11 @@ void
 Resolver::insert_new_definition (NodeId id, Definition def)
 {
   auto it = name_definitions.find (id);
-  rust_assert (it == name_definitions.end ());
-
+  if (it != name_definitions.end ())
+    {
+      rust_assert (it->second.is_equal (def));
+      return;
+    }
   name_definitions[id] = def;
 }
 
diff --git a/gcc/rust/resolve/rust-name-resolver.h b/gcc/rust/resolve/rust-name-resolver.h
index 7938c7c..23e5b65 100644
--- a/gcc/rust/resolve/rust-name-resolver.h
+++ b/gcc/rust/resolve/rust-name-resolver.h
@@ -356,6 +356,11 @@ struct Definition
   NodeId node;
   NodeId parent;
   // add kind ?
+
+  bool is_equal (const Definition &other)
+  {
+    return node == other.node && parent == other.parent;
+  }
 };
 
 class Resolver