A couple of msvc compile fixes from the ml; I haven't tested with msvc,

but the fixes are reasonable.

llvm-svn: 47224

clang/Analysis/GRSimpleVals.cpp

@@ -38,9 +38,9 @@ namespace clang {
          E=CheckerState->null_end(); I!=E; ++I) {
       
       const PostStmt& L = cast<PostStmt>((*I)->getLocation());
-      Expr* E = cast<Expr>(L.getStmt());
+      Expr* Exp = cast<Expr>(L.getStmt());
       
-      Diag.Report(FullSourceLoc(E->getExprLoc(), Ctx.getSourceManager()),
+      Diag.Report(FullSourceLoc(Exp->getExprLoc(), Ctx.getSourceManager()),
                   diag::chkr_null_deref_after_check);
     }
         

clang/Driver/ASTConsumers.h

@@ -14,6 +14,7 @@
 #ifndef DRIVER_ASTCONSUMERS_H
 #define DRIVER_ASTCONSUMERS_H
 
+#include <string>
 #include <iosfwd>
 
 namespace llvm {