commit cbc5f407eff618225a2fd4363f67d660607e6c2d
author Francois Pichet <pichet2000@gmail.com> Sat Apr 16 14:20:39 2011 +0000
committer Francois Pichet <pichet2000@gmail.com> Sat Apr 16 14:20:39 2011 +0000
tree ffb64c2b3a05ec3ad14c37db58b226f6679a45f3
parent 4130278fbee97b9cd1ea4069e9c666bbe89d61f9

Unbreak the MSVC 2010 build.
For further information on this particular issue see: http://connect.microsoft.com/VisualStudio/feedback/details/520043/error-converting-from-null-to-a-pointer-type-in-std-pair

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@129642 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/SplitKit.cpp

diff --git a/lib/CodeGen/SplitKit.cpp b/lib/CodeGen/SplitKit.cpp
index adc0a04..9aadf61 100644
--- a/lib/CodeGen/SplitKit.cpp
+++ b/lib/CodeGen/SplitKit.cpp
@@ -816,7 +816,8 @@
           else {
             // Live-out, but we need updateSSA to tell us the value.
             LiveOutSeen.set(MBB->getNumber());
-            LiveOutCache[MBB] = LiveOutPair(0, 0);
+            LiveOutCache[MBB] = LiveOutPair((VNInfo*)0,
+                                            (MachineDomTreeNode*)0);
           }
         }
         BlockStart = BlockEnd;