Partial unbreak of VC++ (stream stuff has no easy fix).

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@32614 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/VMCore/Constants.cpp b/lib/VMCore/Constants.cpp
index a294902ad8b7f594d2734d4d6afa37010b8ec013..3339a182140a6d5a7657b4288bba3f8aaba3f7d1 100644 (file)
--- a/lib/VMCore/Constants.cpp
+++ b/lib/VMCore/Constants.cpp
@@ -1371,6 +1371,7 @@ namespace llvm {
         return new CompareConstantExpr(Instruction::FCmp, V.predicate, 
                                        V.operands[0], V.operands[1]);
       assert(0 && "Invalid ConstantExpr!");
+      return 0;
     }
   };
 

diff --git a/win32/Analysis/Analysis.vcproj b/win32/Analysis/Analysis.vcproj
index 3d3ec61b5be046b8556db60fd4e7c141343bf697..d2241392e7ead56f3d7f86676bbdba1a0f93f34d 100644 (file)
--- a/win32/Analysis/Analysis.vcproj
+++ b/win32/Analysis/Analysis.vcproj
@@ -193,52 +193,6 @@
                                        RelativePath="..\..\lib\Analysis\Ipa\GlobalsModRef.cpp">
                                </File>
                        </Filter>
-                       <Filter
-                               Name="DataStructure"
-                               Filter="">
-                               <File
-                                       RelativePath="..\..\lib\Analysis\DataStructure\BottomUpClosure.cpp">
-                               </File>
-                               <File
-                                       RelativePath="..\..\lib\Analysis\DataStructure\CallTargets.cpp">
-                               </File>
-                               <File
-                                       RelativePath="..\..\lib\Analysis\DataStructure\CompleteBottomUp.cpp">
-                               </File>
-                               <File
-                                       RelativePath="..\..\lib\Analysis\DataStructure\DataStructure.cpp">
-                               </File>
-                               <File
-                                       RelativePath="..\..\lib\Analysis\DataStructure\DataStructureAA.cpp">
-                               </File>
-                               <File
-                                       RelativePath="..\..\lib\Analysis\DataStructure\DataStructureOpt.cpp">
-                               </File>
-                               <File
-                                       RelativePath="..\..\lib\Analysis\DataStructure\DataStructureStats.cpp">
-                               </File>
-                               <File
-                                       RelativePath="..\..\lib\Analysis\DataStructure\DSCallSiteIterator.h">
-                               </File>
-                               <File
-                                       RelativePath="..\..\lib\Analysis\DataStructure\EquivClassGraphs.cpp">
-                               </File>
-                               <File
-                                       RelativePath="..\..\lib\Analysis\DataStructure\GraphChecker.cpp">
-                               </File>
-                               <File
-                                       RelativePath="..\..\lib\Analysis\DataStructure\Local.cpp">
-                               </File>
-                               <File
-                                       RelativePath="..\..\lib\Analysis\DataStructure\Printer.cpp">
-                               </File>
-                               <File
-                                       RelativePath="..\..\lib\Analysis\DataStructure\Steensgaard.cpp">
-                               </File>
-                               <File
-                                       RelativePath="..\..\lib\Analysis\DataStructure\TopDownClosure.cpp">
-                               </File>
-                       </Filter>
                </Filter>
                <Filter
                        Name="Header Files"
@@ -319,28 +273,6 @@
                        <File
                                RelativePath="..\..\include\llvm\Analysis\Verifier.h">
                        </File>
-                       <Filter
-                               Name="DataStructure"
-                               Filter="">
-                               <File
-                                       RelativePath="..\..\include\llvm\Analysis\DataStructure\CallTargets.h">
-                               </File>
-                               <File
-                                       RelativePath="..\..\include\llvm\Analysis\DataStructure\DataStructure.h">
-                               </File>
-                               <File
-                                       RelativePath="..\..\include\llvm\Analysis\DataStructure\DSGraph.h">
-                               </File>
-                               <File
-                                       RelativePath="..\..\include\llvm\Analysis\DataStructure\DSGraphTraits.h">
-                               </File>
-                               <File
-                                       RelativePath="..\..\include\llvm\Analysis\DataStructure\DSNode.h">
-                               </File>
-                               <File
-                                       RelativePath="..\..\include\llvm\Analysis\DataStructure\DSSupport.h">
-                               </File>
-                       </Filter>
                </Filter>
        </Files>
        <Globals>

diff --git a/win32/VMCore/VMCore.vcproj b/win32/VMCore/VMCore.vcproj
index 37484f545f0d4127988278b207cba3e0f6271e1f..7addd7cb4897f723150c20d78d743d7830214032 100644 (file)
--- a/win32/VMCore/VMCore.vcproj
+++ b/win32/VMCore/VMCore.vcproj
@@ -112,9 +112,6 @@
                        <File
                                RelativePath="..\..\lib\VMCore\AsmWriter.cpp">
                        </File>
-                       <File
-                               RelativePath="..\..\lib\VMCore\AutoUpgrade.cpp">
-                       </File>
                        <File
                                RelativePath="..\..\lib\VMCore\BasicBlock.cpp">
                        </File>
@@ -221,15 +218,9 @@
                        <File
                                RelativePath="..\..\include\llvm\Assembly\AsmAnnotationWriter.h">
                        </File>
-                       <File
-                               RelativePath="..\..\include\llvm\Assembly\AutoUpgrade.h">
-                       </File>
                        <File
                                RelativePath="..\..\include\llvm\BasicBlock.h">
                        </File>
-                       <File
-                               RelativePath="..\..\include\llvm\Assembly\CachedWriter.h">
-                       </File>
                        <File
                                RelativePath="..\..\include\llvm\CallGraphSCCPass.h">
                        </File>