Merge #838

838: Add mssing mappings to HIR::Pattern r=philberty a=philberty

These mappings are missing within the HIR but are required
to complete typechecking of all patterns in match arms. As the
fields of structures must bind their associated field's types to new
names declared as part of the pattern, these mappings give access
to the associated name-resolved NodeId's to figure this out.

Co-authored-by: Philip Herron <[email protected]>

Author: bors[bot]

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

@@ -61,8 +61,13 @@ ASTLoweringPattern::visit (AST::TupleStructPattern &pattern)
       break;
     }
 
+  auto crate_num = mappings->get_current_crate ();
+  Analysis::NodeMapping mapping (crate_num, pattern.get_node_id (),
+				 mappings->get_next_hir_id (crate_num),
+				 UNKNOWN_LOCAL_DEFID);
+
   translated = new HIR::TupleStructPattern (
-    *path, std::unique_ptr<HIR::TupleStructItems> (lowered));
+    mapping, *path, std::unique_ptr<HIR::TupleStructItems> (lowered));
 }
 
 void
@@ -96,19 +101,38 @@ ASTLoweringPattern::visit (AST::StructPattern &pattern)
 	    AST::StructPatternFieldIdent &ident
 	      = static_cast<AST::StructPatternFieldIdent &> (*field.get ());
 
+	    auto crate_num = mappings->get_current_crate ();
+	    Analysis::NodeMapping mapping (crate_num, ident.get_node_id (),
+					   mappings->get_next_hir_id (
+					     crate_num),
+					   UNKNOWN_LOCAL_DEFID);
+
 	    f = new HIR::StructPatternFieldIdent (
-	      ident.get_identifier (), ident.is_ref (),
+	      mapping, ident.get_identifier (), ident.is_ref (),
 	      ident.is_mut () ? Mutability::Mut : Mutability::Imm,
 	      ident.get_outer_attrs (), ident.get_locus ());
 	  }
 	  break;
 	}
 
+      // insert the reverse mappings and locations
+      auto crate_num = f->get_mappings ().get_crate_num ();
+      auto field_id = f->get_mappings ().get_hirid ();
+      auto field_node_id = f->get_mappings ().get_nodeid ();
+      mappings->insert_location (crate_num, field_id, f->get_locus ());
+      mappings->insert_node_to_hir (crate_num, field_node_id, field_id);
+
+      // add it to the lowered fields list
       fields.push_back (std::unique_ptr<HIR::StructPatternField> (f));
     }
 
+  auto crate_num = mappings->get_current_crate ();
+  Analysis::NodeMapping mapping (crate_num, pattern.get_node_id (),
+				 mappings->get_next_hir_id (crate_num),
+				 UNKNOWN_LOCAL_DEFID);
+
   HIR::StructPatternElements elems (std::move (fields));
-  translated = new HIR::StructPattern (*path, std::move (elems));
+  translated = new HIR::StructPattern (mapping, *path, std::move (elems));
 }
 
 } // namespace HIR

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

@@ -33,16 +33,32 @@ class ASTLoweringPattern : public ASTLoweringBase
   {
     ASTLoweringPattern resolver;
     pattern->accept_vis (resolver);
+
     rust_assert (resolver.translated != nullptr);
+
+    resolver.mappings->insert_hir_pattern (
+      resolver.translated->get_pattern_mappings ().get_crate_num (),
+      resolver.translated->get_pattern_mappings ().get_hirid (),
+      resolver.translated);
+    resolver.mappings->insert_location (
+      resolver.translated->get_pattern_mappings ().get_crate_num (),
+      resolver.translated->get_pattern_mappings ().get_hirid (),
+      pattern->get_locus ());
+
     return resolver.translated;
   }
 
   void visit (AST::IdentifierPattern &pattern) override
   {
+    auto crate_num = mappings->get_current_crate ();
+    Analysis::NodeMapping mapping (crate_num, pattern.get_node_id (),
+				   mappings->get_next_hir_id (crate_num),
+				   UNKNOWN_LOCAL_DEFID);
+
     std::unique_ptr<Pattern> to_bind;
     translated
-      = new HIR::IdentifierPattern (pattern.get_ident (), pattern.get_locus (),
-				    pattern.get_is_ref (),
+      = new HIR::IdentifierPattern (mapping, pattern.get_ident (),
+				    pattern.get_locus (), pattern.get_is_ref (),
 				    pattern.get_is_mut () ? Mutability::Mut
 							  : Mutability::Imm,
 				    std::move (to_bind));

gcc/rust/hir/tree/rust-hir-path.h

@@ -330,6 +330,11 @@ class PathInExpression : public PathPattern, public PathExpr
 	   == 0;
   }
 
+  Analysis::NodeMapping get_pattern_mappings () const override final
+  {
+    return get_mappings ();
+  }
+
 protected:
   /* Use covariance to implement clone function as returning this object rather
    * than base */
@@ -824,6 +829,11 @@ class QualifiedPathInExpression : public PathPattern, public PathExpr
 
   Location get_locus () { return locus; }
 
+  Analysis::NodeMapping get_pattern_mappings () const override final
+  {
+    return get_mappings ();
+  }
+
 protected:
   /* Use covariance to implement clone function as returning this object rather
    * than base */