diff options
author | Francois Pichet <pichet2000@gmail.com> | 2011-04-16 14:20:39 +0000 |
---|---|---|
committer | Francois Pichet <pichet2000@gmail.com> | 2011-04-16 14:20:39 +0000 |
commit | beb17d935946b71159af069158f3291aa275c7ff (patch) | |
tree | 42e07c97e92356670f40fc68ce9376c9158fedda /llvm/lib/CodeGen/SplitKit.cpp | |
parent | 7d03e9be47d586ebd288f40d939e5c9f94cfb188 (diff) | |
download | bcm5719-llvm-beb17d935946b71159af069158f3291aa275c7ff.tar.gz bcm5719-llvm-beb17d935946b71159af069158f3291aa275c7ff.zip |
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
Diffstat (limited to 'llvm/lib/CodeGen/SplitKit.cpp')
-rw-r--r-- | llvm/lib/CodeGen/SplitKit.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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; |