summaryrefslogtreecommitdiff
path: root/lib/CodeGen/SplitKit.cpp
diff options
context:
space:
mode:
authorFrancois Pichet <pichet2000@gmail.com>2011-04-16 14:20:39 +0000
committerFrancois Pichet <pichet2000@gmail.com>2011-04-16 14:20:39 +0000
commitcbc5f407eff618225a2fd4363f67d660607e6c2d (patch)
treeffb64c2b3a05ec3ad14c37db58b226f6679a45f3 /lib/CodeGen/SplitKit.cpp
parent4130278fbee97b9cd1ea4069e9c666bbe89d61f9 (diff)
downloadllvm-cbc5f407eff618225a2fd4363f67d660607e6c2d.tar.gz
llvm-cbc5f407eff618225a2fd4363f67d660607e6c2d.tar.bz2
llvm-cbc5f407eff618225a2fd4363f67d660607e6c2d.tar.xz
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
Diffstat (limited to 'lib/CodeGen/SplitKit.cpp')
-rw-r--r--lib/CodeGen/SplitKit.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/CodeGen/SplitKit.cpp b/lib/CodeGen/SplitKit.cpp
index adc0a04ea6..9aadf6184b 100644
--- a/lib/CodeGen/SplitKit.cpp
+++ b/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;