Fix VC++ build errors.

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

diff --git a/utils/TableGen/DAGISelEmitter.cpp b/utils/TableGen/DAGISelEmitter.cpp
index d5153caa2e02f89a3e89b861dc94429723a7bbaf..ae38830a9d173c4c7d4e14a437f0fa694fe48c76 100644 (file)
--- a/utils/TableGen/DAGISelEmitter.cpp
+++ b/utils/TableGen/DAGISelEmitter.cpp
@@ -15,6 +15,7 @@
 #include "Record.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/Support/Debug.h"
+#include <algorithm>
 #include <set>
 using namespace llvm;
 
@@ -1128,6 +1129,7 @@ CodeGenPatternResult(TreePatternNode *N, unsigned &Ctr,
   } else {
     N->dump();
     assert(0 && "Unknown node in result pattern!");
+    return ~0U;
   }
 }
 

diff --git a/win32/CodeGen/CodeGen.vcproj b/win32/CodeGen/CodeGen.vcproj
index fb2c37e123db26adf00f2c5f02701a22f879f01d..ac39ecfb0105620b0554e6b8b94614586c2d9e3f 100644 (file)
--- a/win32/CodeGen/CodeGen.vcproj
+++ b/win32/CodeGen/CodeGen.vcproj
@@ -212,10 +212,10 @@
                                RelativePath="..\..\include\llvm\CodeGen\IntrinsicLowering.h">
                        </File>
                        <File
-                               RelativePath="..\..\lib\CodeGen\LiveInterval.h">
+                               RelativePath="..\..\include\llvm\CodeGen\LiveInterval.h">
                        </File>
                        <File
-                               RelativePath="..\..\lib\CodeGen\LiveIntervalAnalysis.h">
+                               RelativePath="..\..\include\llvm\CodeGen\LiveIntervalAnalysis.h">
                        </File>
                        <File
                                RelativePath="..\..\include\llvm\CodeGen\LiveVariables.h">