[astgen] Correctly thread initializer through VarDecl visitor.

Author: zoecarver

include/swift/AST/CASTBridging.h

@@ -125,6 +125,7 @@ void *SwiftIntegerLiteralExpr_create(void *ctx, const uint8_t *_Nullable string,
 void *SwiftBooleanLiteralExpr_create(void *ctx, _Bool value, void *TokenLoc);
 
 void *SwiftVarDecl_create(void *ctx, BridgedIdentifier _Nullable name,
+                          void *initExpr,
                           void *loc, _Bool isStatic, _Bool isLet, void *dc);
 
 void *IfStmt_create(void *ctx, void *ifLoc, void *cond, void *_Nullable then,

lib/AST/CASTBridging.cpp

@@ -6,6 +6,7 @@
 #include "swift/AST/Expr.h"
 #include "swift/AST/GenericParamList.h"
 #include "swift/AST/Identifier.h"
+#include "swift/AST/Pattern.h"
 #include "swift/AST/ParameterList.h"
 #include "swift/AST/Stmt.h"
 #include "swift/AST/TypeRepr.h"
@@ -139,12 +140,19 @@ void *SwiftBooleanLiteralExpr_create(void *ctx, bool value, void *TokenLoc) {
 }
 
 void *SwiftVarDecl_create(void *ctx, BridgedIdentifier _Nullable nameId,
+                          void *initExpr,
                           void *loc, bool isStatic, bool isLet, void *dc) {
   ASTContext &Context = *static_cast<ASTContext *>(ctx);
   auto name = (UnresolvedDeclRefExpr *)nameId;
-  return new (Context) VarDecl(
+  auto sourceLoc = getSourceLocFromPointer(loc);
+  auto varDecl = new (Context) VarDecl(
       isStatic, isLet ? VarDecl::Introducer::Let : VarDecl::Introducer::Var,
-      getSourceLocFromPointer(loc), name->getName().getBaseIdentifier(),
+      sourceLoc, name->getName().getBaseIdentifier(),
+      reinterpret_cast<DeclContext *>(dc));
+  auto pattern = NamedPattern::createImplicit(Context, varDecl);
+  return PatternBindingDecl::create(Context, sourceLoc,
+      isStatic ? StaticSpellingKind::KeywordStatic : StaticSpellingKind::None,
+      sourceLoc, pattern, sourceLoc, (Expr *)initExpr,
       reinterpret_cast<DeclContext *>(dc));
 }
 

lib/ASTGen/Sources/ASTGen/Decls.swift

@@ -75,7 +75,8 @@ extension ASTGenVisitor {
     let isLet = node.letOrVarKeyword.tokenKind == .letKeyword
 
     // TODO: don't drop "initializer" on the floor.
-    return .decl(SwiftVarDecl_create(ctx, pattern, loc, isStateic, isLet, declContext))
+    return .decl(SwiftVarDecl_create(ctx, pattern, initializer, loc, isStateic,
+                                     isLet, declContext))
   }
 
   public func visit(_ node: FunctionParameterSyntax) -> ASTNode {