commit | beb17d935946b71159af069158f3291aa275c7ff | [log] [tgz] |
---|---|---|
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 | 42e07c97e92356670f40fc68ce9376c9158fedda | |
parent | 7d03e9be47d586ebd288f40d939e5c9f94cfb188 [diff] [blame] |
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
diff --git a/llvm/lib/CodeGen/SplitKit.cpp b/llvm/lib/CodeGen/SplitKit.cpp index adc0a04..9aadf61 100644 --- a/llvm/lib/CodeGen/SplitKit.cpp +++ b/llvm/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;