[gcc/devel/rust/master] Fix toplevel crate ribs id's

[gcc/devel/rust/master] Fix toplevel crate ribs id's

[Thomas Schwinge]

https://gcc.gnu.org/g:a6cae6da5130f936356a1d3cb76224f8fba66503

commit a6cae6da5130f936356a1d3cb76224f8fba66503
Author: Philip Herron <philip.herron@embecosm.com>
Date:   Mon Nov 22 17:05:18 2021 +0000

    Fix toplevel crate ribs id's
    
    Toplevel ribs should be the same id of the Crate this allows is to scan
    all toplevel ribs simply by knowing the crate number.

Diff:
---
 gcc/rust/resolve/rust-ast-resolve.cc | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/gcc/rust/resolve/rust-ast-resolve.cc b/gcc/rust/resolve/rust-ast-resolve.cc
index 9a0d349a2fd..66553a6e409 100644
--- a/gcc/rust/resolve/rust-ast-resolve.cc
+++ b/gcc/rust/resolve/rust-ast-resolve.cc
@@ -313,14 +313,12 @@ NameResolution::Resolve (AST::Crate &crate)
 void
 NameResolution::go (AST::Crate &crate)
 {
-  // setup parent scoping for names
-  resolver->get_name_scope ().push (crate.get_node_id ());
+  NodeId scope_node_id = crate.get_node_id ();
+  resolver->get_name_scope ().push (scope_node_id);
+  resolver->get_type_scope ().push (scope_node_id);
+  resolver->get_label_scope ().push (scope_node_id);
   resolver->push_new_name_rib (resolver->get_name_scope ().peek ());
-  // setup parent scoping for new types
-  resolver->get_type_scope ().push (mappings->get_next_node_id ());
   resolver->push_new_type_rib (resolver->get_type_scope ().peek ());
-  // setup label scope
-  resolver->get_label_scope ().push (mappings->get_next_node_id ());
   resolver->push_new_label_rib (resolver->get_type_scope ().peek ());
 
   // first gather the top-level namespace names then we drill down