summaryrefslogtreecommitdiffstats
path: root/llvm
diff options
context:
space:
mode:
Diffstat (limited to 'llvm')
-rw-r--r--llvm/utils/TableGen/DAGISelEmitter.cpp2
-rw-r--r--llvm/win32/CodeGen/CodeGen.vcproj4
2 files changed, 4 insertions, 2 deletions
diff --git a/llvm/utils/TableGen/DAGISelEmitter.cpp b/llvm/utils/TableGen/DAGISelEmitter.cpp
index d5153caa2e0..ae38830a9d1 100644
--- a/llvm/utils/TableGen/DAGISelEmitter.cpp
+++ b/llvm/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/llvm/win32/CodeGen/CodeGen.vcproj b/llvm/win32/CodeGen/CodeGen.vcproj
index fb2c37e123d..ac39ecfb010 100644
--- a/llvm/win32/CodeGen/CodeGen.vcproj
+++ b/llvm/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">
OpenPOWER on IntegriCloud