diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index aaceb4f559..3484849161 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -2536,6 +2536,7 @@ Sema::DeclTy *Sema::ActOnField(Scope *S,
     } else {
       // FIXME: This diagnostic needs work
       Diag(Loc, diag::err_typecheck_illegal_vla, Loc);
+      T = Context.IntTy;
       InvalidDecl = true;
     }
   }