diff --git a/clang/lib/StaticAnalyzer/Core/ExprEngineCallAndReturn.cpp b/clang/lib/StaticAnalyzer/Core/ExprEngineCallAndReturn.cpp
index cd67a030b7d8..f5e319fb8260 100644
--- a/clang/lib/StaticAnalyzer/Core/ExprEngineCallAndReturn.cpp
+++ b/clang/lib/StaticAnalyzer/Core/ExprEngineCallAndReturn.cpp
@@ -99,7 +99,7 @@ static std::pair<const Stmt*,
     }
 
     if (Node->pred_empty())
-      return std::pair<const Stmt*, const CFGBlock*>(0, 0);
+      return std::pair<const Stmt*, const CFGBlock*>((Stmt*)0, (CFGBlock*)0);
 
     Node = *Node->pred_begin();
   }
@@ -116,7 +116,7 @@ static std::pair<const Stmt*,
         break;
       }
       if (Node->pred_empty())
-        return std::pair<const Stmt*, const CFGBlock*>(S, 0);
+        return std::pair<const Stmt*, const CFGBlock*>(S, (CFGBlock*)0);
 
       Node = *Node->pred_begin();
     }