1 files changed, 17 insertions, 53 deletions

diff --git a/gcc/rust/backend/rust-compile-var-decl.h b/gcc/rust/backend/rust-compile-var-decl.h
index 2dab39e..e2ee05b 100644
--- a/gcc/rust/backend/rust-compile-var-decl.h
+++ b/gcc/rust/backend/rust-compile-var-decl.h
@@ -25,36 +25,19 @@
 namespace Rust {
 namespace Compile {
 
-class CompileVarDecl : public HIRCompileBase,
-		       public HIR::HIRPatternVisitor,
-		       public HIR::HIRStmtVisitor
+class CompileVarDecl : public HIRCompileBase, public HIR::HIRPatternVisitor
 {
   using HIR::HIRPatternVisitor::visit;
-  using HIR::HIRStmtVisitor::visit;
 
 public:
-  static ::Bvariable *compile (tree fndecl, HIR::Stmt *stmt, Context *ctx)
+  static ::Bvariable *compile (tree fndecl, tree translated_type,
+			       HIR::Pattern *pattern, Context *ctx)
   {
-    CompileVarDecl compiler (ctx, fndecl);
-    stmt->accept_vis (compiler);
-    ctx->insert_var_decl (stmt->get_mappings ().get_hirid (),
-			  compiler.compiled_variable);
+    CompileVarDecl compiler (ctx, fndecl, translated_type);
+    pattern->accept_vis (compiler);
     return compiler.compiled_variable;
   }
 
-  void visit (HIR::LetStmt &stmt) override
-  {
-    locus = stmt.get_locus ();
-    TyTy::BaseType *resolved_type = nullptr;
-    bool ok = ctx->get_tyctx ()->lookup_type (stmt.get_mappings ().get_hirid (),
-					      &resolved_type);
-    rust_assert (ok);
-
-    translated_type = TyTyResolveCompile::compile (ctx, resolved_type);
-    stmt.get_pattern ()->accept_vis (
-      static_cast<HIR::HIRPatternVisitor &> (*this));
-  }
-
   void visit (HIR::IdentifierPattern &pattern) override
   {
     if (!pattern.is_mut ())
@@ -63,7 +46,10 @@ public:
     compiled_variable
       = ctx->get_backend ()->local_variable (fndecl, pattern.get_identifier (),
 					     translated_type, NULL /*decl_var*/,
-					     locus);
+					     pattern.get_locus ());
+
+    HirId stmt_id = pattern.get_pattern_mappings ().get_hirid ();
+    ctx->insert_var_decl (stmt_id, compiled_variable);
   }
 
   void visit (HIR::WildcardPattern &pattern) override
@@ -72,7 +58,11 @@ public:
 
     compiled_variable
       = ctx->get_backend ()->local_variable (fndecl, "_", translated_type,
-					     NULL /*decl_var*/, locus);
+					     NULL /*decl_var*/,
+					     pattern.get_locus ());
+
+    HirId stmt_id = pattern.get_pattern_mappings ().get_hirid ();
+    ctx->insert_var_decl (stmt_id, compiled_variable);
   }
 
   // Empty visit for unused Pattern HIR nodes.
@@ -87,41 +77,15 @@ public:
   void visit (HIR::TuplePattern &) override {}
   void visit (HIR::TupleStructPattern &) override {}
 
-  // Empty visit for unused Stmt HIR nodes.
-  void visit (HIR::EnumItemTuple &) override {}
-  void visit (HIR::EnumItemStruct &) override {}
-  void visit (HIR::EnumItem &item) override {}
-  void visit (HIR::TupleStruct &tuple_struct) override {}
-  void visit (HIR::EnumItemDiscriminant &) override {}
-  void visit (HIR::TypePathSegmentFunction &segment) override {}
-  void visit (HIR::TypePath &path) override {}
-  void visit (HIR::QualifiedPathInType &path) override {}
-  void visit (HIR::Module &module) override {}
-  void visit (HIR::ExternCrate &crate) override {}
-  void visit (HIR::UseDeclaration &use_decl) override {}
-  void visit (HIR::Function &function) override {}
-  void visit (HIR::TypeAlias &type_alias) override {}
-  void visit (HIR::StructStruct &struct_item) override {}
-  void visit (HIR::Enum &enum_item) override {}
-  void visit (HIR::Union &union_item) override {}
-  void visit (HIR::ConstantItem &const_item) override {}
-  void visit (HIR::StaticItem &static_item) override {}
-  void visit (HIR::Trait &trait) override {}
-  void visit (HIR::ImplBlock &impl) override {}
-  void visit (HIR::ExternBlock &block) override {}
-  void visit (HIR::EmptyStmt &stmt) override {}
-  void visit (HIR::ExprStmtWithoutBlock &stmt) override {}
-  void visit (HIR::ExprStmtWithBlock &stmt) override {}
-
 private:
-  CompileVarDecl (Context *ctx, tree fndecl)
-    : HIRCompileBase (ctx), fndecl (fndecl), translated_type (error_mark_node),
+  CompileVarDecl (Context *ctx, tree fndecl, tree translated_type)
+    : HIRCompileBase (ctx), fndecl (fndecl), translated_type (translated_type),
       compiled_variable (ctx->get_backend ()->error_variable ())
   {}
 
   tree fndecl;
   tree translated_type;
-  Location locus;
+
   Bvariable *compiled_variable;
 };