diff --git a/AST/Expr.cpp b/AST/Expr.cpp
index 8ce5846cce..620c29b095 100644
--- a/AST/Expr.cpp
+++ b/AST/Expr.cpp
@@ -368,7 +368,8 @@ bool Expr::isConstantExpr(ASTContext &Ctx, SourceLocation *Loc) const {
   case CallExprClass: {
     const CallExpr *CE = cast<CallExpr>(this);
     llvm::APSInt Result(32);
-    Result.zextOrTrunc(Ctx.getTypeSize(getType(), CE->getLocStart()));
+    Result.zextOrTrunc(
+      static_cast<uint32_t>(Ctx.getTypeSize(getType(), CE->getLocStart())));
     if (CE->isBuiltinClassifyType(Result))
       break;
     if (Loc) *Loc = getLocStart();
diff --git a/win32/clangDriver/clangDriver.vcproj b/win32/clangDriver/clangDriver.vcproj
index f559cf5e0d..c38b2ac299 100644
--- a/win32/clangDriver/clangDriver.vcproj
+++ b/win32/clangDriver/clangDriver.vcproj
@@ -197,10 +197,6 @@
 				RelativePath="..\..\Driver\DiagChecker.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\Driver\LLVMCodegen.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\Driver\PrintParserCallbacks.cpp"
 				>