From beb17d935946b71159af069158f3291aa275c7ff Mon Sep 17 00:00:00 2001 From: Francois Pichet Date: Sat, 16 Apr 2011 14:20:39 +0000 Subject: 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 llvm-svn: 129642 --- llvm/lib/CodeGen/SplitKit.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'llvm/lib/CodeGen') diff --git a/llvm/lib/CodeGen/SplitKit.cpp b/llvm/lib/CodeGen/SplitKit.cpp index adc0a04ea64..9aadf6184b8 100644 --- a/llvm/lib/CodeGen/SplitKit.cpp +++ b/llvm/lib/CodeGen/SplitKit.cpp @@ -816,7 +816,8 @@ bool SplitEditor::transferValues() { 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; -- cgit v1.2.3