Add some of Ted's recent work to the VC++ project file.
Fix a couple bozo bugs in the rewriter.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@48903 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Driver/RewriteTest.cpp b/Driver/RewriteTest.cpp
index d80b924..afd34b9 100644
--- a/Driver/RewriteTest.cpp
+++ b/Driver/RewriteTest.cpp
@@ -281,6 +281,7 @@
   NSStringRecord = 0;
   CurMethodDecl = 0;
   SuperStructDecl = 0;
+  ConstantStringDecl = 0;
   BcLabelCount = 0;
   SuperContructorFunctionDecl = 0;
   NumObjCStringLiterals = 0;
@@ -1844,7 +1845,7 @@
     // long length;
     FieldTypes[3] = Context->LongTy;  
     // Create fields
-    FieldDecl *FieldDecls[2];
+    FieldDecl *FieldDecls[4];
   
     for (unsigned i = 0; i < 4; ++i)
       FieldDecls[i] = FieldDecl::Create(*Context, SourceLocation(), 0,