[llvm-commits] [llvm] r129642 - /llvm/trunk/lib/CodeGen/SplitKit.cpp

Francois Pichet pichet2000 at gmail.com
Sat Apr 16 07:20:39 PDT 2011


Author: fpichet
Date: Sat Apr 16 09:20:39 2011
New Revision: 129642

URL: http://llvm.org/viewvc/llvm-project?rev=129642&view=rev
Log:
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

Modified:
    llvm/trunk/lib/CodeGen/SplitKit.cpp

Modified: llvm/trunk/lib/CodeGen/SplitKit.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SplitKit.cpp?rev=129642&r1=129641&r2=129642&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/SplitKit.cpp (original)
+++ llvm/trunk/lib/CodeGen/SplitKit.cpp Sat Apr 16 09:20:39 2011
@@ -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;





More information about the llvm-commits mailing list