gccrs: Implement compilation of IdentifierPattern's subpattern bindings

gcc/rust/ast/rust-ast-collector.cc

@@ -2485,7 +2485,7 @@ TokenCollector::visit (IdentifierPattern &pattern)
   if (pattern.has_subpattern ())
     {
       push (Rust::Token::make (PATTERN_BIND, UNDEF_LOCATION));
-      visit (pattern.get_pattern_to_bind ());
+      visit (pattern.get_subpattern ());
     }
 }
 

gcc/rust/ast/rust-ast-visitor.cc

@@ -1200,7 +1200,7 @@ void
 DefaultASTVisitor::visit (AST::IdentifierPattern &pattern)
 {
   if (pattern.has_subpattern ())
-    visit (pattern.get_pattern_to_bind ());
+    visit (pattern.get_subpattern ());
 }
 
 void

gcc/rust/ast/rust-pattern.h

@@ -137,8 +137,7 @@ class IdentifierPattern : public Pattern
 
   void accept_vis (ASTVisitor &vis) override;
 
-  // TODO: is this better? Or is a "vis_pattern" better?
-  Pattern &get_pattern_to_bind ()
+  Pattern &get_subpattern ()
   {
     rust_assert (has_subpattern ());
     return *subpattern;

gcc/rust/backend/rust-compile-pattern.cc

@@ -666,6 +666,12 @@ CompilePatternBindings::visit (HIR::ReferencePattern &pattern)
 void
 CompilePatternBindings::visit (HIR::IdentifierPattern &pattern)
 {
+  if (pattern.has_subpattern ())
+    {
+      CompilePatternBindings::Compile (pattern.get_subpattern (),
+				       match_scrutinee_expr, ctx);
+    }
+
   if (!pattern.get_is_ref ())
     {
       ctx->insert_pattern_binding (pattern.get_mappings ().get_hirid (),

gcc/rust/expand/rust-cfg-strip.cc

@@ -2267,7 +2267,7 @@ CfgStrip::visit (AST::IdentifierPattern &pattern)
 
   AST::DefaultASTVisitor::visit (pattern);
 
-  auto &sub_pattern = pattern.get_pattern_to_bind ();
+  auto &sub_pattern = pattern.get_subpattern ();
   if (sub_pattern.is_marked_for_strip ())
     rust_error_at (sub_pattern.get_locus (),
 		   "cannot strip pattern in this position");

gcc/rust/hir/rust-ast-lower-pattern.cc

@@ -53,7 +53,7 @@ ASTLoweringPattern::visit (AST::IdentifierPattern &pattern)
   if (pattern.has_subpattern ())
     {
       subpattern = std::unique_ptr<Pattern> (
-	ASTLoweringPattern::translate (pattern.get_pattern_to_bind ()));
+	ASTLoweringPattern::translate (pattern.get_subpattern ()));
     }
   translated
     = new HIR::IdentifierPattern (mapping, pattern.get_ident (),

gcc/rust/resolve/rust-ast-resolve-pattern.cc

@@ -62,6 +62,11 @@ PatternDeclaration::go (AST::Pattern &pattern, Rib::ItemType type,
 void
 PatternDeclaration::visit (AST::IdentifierPattern &pattern)
 {
+  if (pattern.has_subpattern ())
+    {
+      pattern.get_subpattern ().accept_vis (*this);
+    }
+
   Mutability mut = pattern.get_is_mut () ? Mutability::Mut : Mutability::Imm;
   add_new_binding (pattern.get_ident (), pattern.get_node_id (),
 		   BindingTypeInfo (mut, pattern.get_is_ref (),

gcc/rust/resolve/rust-late-name-resolver-2.0.cc

@@ -250,6 +250,11 @@ visit_identifier_as_pattern (NameResolutionContext &ctx,
 void
 Late::visit (AST::IdentifierPattern &identifier)
 {
+  if (identifier.has_subpattern ())
+    {
+      DefaultResolver::visit (identifier.get_subpattern ());
+    }
+
   visit_identifier_as_pattern (ctx, identifier.get_ident (),
 			       identifier.get_locus (),
 			       identifier.get_node_id ());

gcc/testsuite/rust/compile/match-identifierpattern-enum.rs

@@ -0,0 +1,12 @@
+enum Foo {
+    I(i32),
+}
+
+fn main() {
+    let x = Foo::I(1);
+
+    match x {
+        a @ Foo::I(b) => {},
+        _ => {},
+    };
+}

gcc/testsuite/rust/execute/match-identifierpattern-enum.rs

@@ -0,0 +1,15 @@
+enum Foo {
+    I(i32),
+}
+
+fn main() -> i32 {
+    let x = Foo::I(0);
+    let ret = 1;
+
+    match x {
+        _ @ Foo::I(b) => { ret = b },
+        _ => {},
+    };
+
+    ret
+}