Improve handling of ConstantItem during name resolution 2.0

gcc/rust/ChangeLog: * resolve/rust-default-resolver.cc (DefaultResolver::visit): Scope with Rib::Kind::ConstantItem instead of Rib::Kind::Item. * resolve/rust-toplevel-name-resolver-2.0.cc (TopLevel::visit): Remove redundancy in override of ConstantItem visitor. Signed-off-by: Owen Avery <[email protected]>
Rust-GCC · Jun 6, 2024 · 75049a3 · 75049a3
1 parent 6460460
commit 75049a3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/gcc/rust/resolve/rust-default-resolver.cc b/gcc/rust/resolve/rust-default-resolver.cc
@@ -487,7 +487,7 @@ DefaultResolver::visit (AST::ConstantItem &item)
       };
 
       // FIXME: Why do we need a Rib here?
-      ctx.scoped (Rib::Kind::Item, item.get_node_id (), expr_vis);
+      ctx.scoped (Rib::Kind::ConstantItem, item.get_node_id (), expr_vis);
     }
 }
 

diff --git a/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc b/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc
@@ -424,10 +424,7 @@ TopLevel::visit (AST::ConstantItem &const_item)
   insert_or_error_out (const_item.get_identifier (), const_item,
 		       Namespace::Values);
 
-  auto expr_vis
-    = [this, &const_item] () { const_item.get_expr ().accept_vis (*this); };
-
-  ctx.scoped (Rib::Kind::ConstantItem, const_item.get_node_id (), expr_vis);
+  DefaultResolver::visit (const_item);
 }
 
 bool
-Original file line number
+Diff line change
@@ Expand Up / @@ -487,7 +487,7 @@ DefaultResolver::visit (AST::ConstantItem &item) @@
           };
           // FIXME: Why do we need a Rib here?
-          ctx.scoped (Rib::Kind::Item, item.get_node_id (), expr_vis);
+          ctx.scoped (Rib::Kind::ConstantItem, item.get_node_id (), expr_vis);
         }
     }
@@ Expand Down @@