1 files changed, 36 insertions, 12 deletions

diff --git a/gcc/rust/resolve/rust-late-name-resolver-2.0.cc b/gcc/rust/resolve/rust-late-name-resolver-2.0.cc
index 62829e0..e39ca15 100644
--- a/gcc/rust/resolve/rust-late-name-resolver-2.0.cc
+++ b/gcc/rust/resolve/rust-late-name-resolver-2.0.cc
@@ -19,6 +19,7 @@
 #include "optional.h"
 #include "rust-ast-full.h"
 #include "rust-diagnostics.h"
+#include "rust-expr.h"
 #include "rust-hir-map.h"
 #include "rust-late-name-resolver-2.0.h"
 #include "rust-default-resolver.h"
@@ -141,7 +142,10 @@ Late::visit (AST::ForLoopExpr &expr)
   ctx.bindings.exit ();
 
   visit (expr.get_iterator_expr ());
-  visit (expr.get_loop_label ());
+
+  if (expr.has_loop_label ())
+    visit (expr.get_loop_label ());
+
   visit (expr.get_loop_block ());
 }
 
@@ -208,10 +212,32 @@ Late::visit (AST::LetStmt &let)
   //      let.get_node_id (), [] () {});
 }
 
+void
+Late::visit (AST::WhileLetLoopExpr &while_let)
+{
+  DefaultASTVisitor::visit_outer_attrs (while_let);
+
+  if (while_let.has_loop_label ())
+    visit (while_let.get_loop_label ());
+
+  // visit expression before pattern
+  // this makes variable shadowing work properly
+  visit (while_let.get_scrutinee_expr ());
+
+  ctx.bindings.enter (BindingSource::WhileLet);
+
+  for (auto &pattern : while_let.get_patterns ())
+    visit (pattern);
+
+  ctx.bindings.exit ();
+
+  visit (while_let.get_loop_block ());
+}
+
 static void
 visit_identifier_as_pattern (NameResolutionContext &ctx,
 			     const Identifier &ident, location_t locus,
-			     NodeId node_id)
+			     NodeId node_id, bool is_ref, bool is_mut)
 {
   // do we insert in labels or in values
   // but values does not allow shadowing... since functions cannot shadow
@@ -232,7 +258,7 @@ visit_identifier_as_pattern (NameResolutionContext &ctx,
       return;
     }
 
-  ctx.bindings.peek ().insert_ident (ident);
+  ctx.bindings.peek ().insert_ident (ident.as_string (), locus, is_ref, is_mut);
 
   if (ctx.bindings.peek ().is_or_bound (ident))
     {
@@ -251,9 +277,13 @@ visit_identifier_as_pattern (NameResolutionContext &ctx,
 void
 Late::visit (AST::IdentifierPattern &identifier)
 {
+  DefaultResolver::visit (identifier);
+
   visit_identifier_as_pattern (ctx, identifier.get_ident (),
 			       identifier.get_locus (),
-			       identifier.get_node_id ());
+			       identifier.get_node_id (),
+			       identifier.get_is_ref (),
+			       identifier.get_is_mut ());
 }
 
 void
@@ -284,7 +314,8 @@ void
 Late::visit (AST::StructPatternFieldIdent &field)
 {
   visit_identifier_as_pattern (ctx, field.get_identifier (), field.get_locus (),
-			       field.get_node_id ());
+			       field.get_node_id (), field.is_ref (),
+			       field.is_mut ());
 }
 
 void
@@ -612,13 +643,6 @@ Late::visit (AST::Trait &trait)
 }
 
 void
-Late::visit (AST::StructStruct &s)
-{
-  auto s_vis = [this, &s] () { AST::DefaultASTVisitor::visit (s); };
-  ctx.scoped (Rib::Kind::Item, s.get_node_id (), s_vis);
-}
-
-void
 Late::visit (AST::StructExprStruct &s)
 {
   visit_outer_attrs (s);