Fixed compilation of array optimization patch with LLVM >= 4.0

3 files changed, 4 insertions, 6 deletions

diff --git a/include/klee/ArrayExprOptimizer.h b/include/klee/ArrayExprOptimizer.h
index 9b62571f..2d8a9014 100644
--- a/include/klee/ArrayExprOptimizer.h
+++ b/include/klee/ArrayExprOptimizer.h
@@ -26,9 +26,9 @@
 #include "util/Ref.h"
 #include "klee/AssignmentGenerator.h"
 #include "klee/ExecutionState.h"
+#include "klee/Config/Version.h"
 
-#include "llvm/Support/TimeValue.h"
-#include "klee/Internal/System/Time.h"
+#include "llvm/Support/CommandLine.h"
 
 #include <ciso646>
 
diff --git a/include/klee/AssignmentGenerator.h b/include/klee/AssignmentGenerator.h
index aa228755..96209498 100644
--- a/include/klee/AssignmentGenerator.h
+++ b/include/klee/AssignmentGenerator.h
@@ -24,8 +24,6 @@
 #include "util/Assignment.h"
 #include "util/Ref.h"
 
-#include "llvm/Support/TimeValue.h"
-#include "klee/Internal/System/Time.h"
 
 namespace klee {
 
diff --git a/lib/Expr/ArrayExprOptimizer.cpp b/lib/Expr/ArrayExprOptimizer.cpp
index b3e8bca0..3a071665 100644
--- a/lib/Expr/ArrayExprOptimizer.cpp
+++ b/lib/Expr/ArrayExprOptimizer.cpp
@@ -23,8 +23,8 @@ llvm::cl::opt<ArrayOptimizationType> OptimizeArray(
         clEnumValN(ALL, "all", "Combining index and value transformations"),
         clEnumValN(INDEX, "index", "Index-based transformation"),
         clEnumValN(VALUE, "value", "Value-based transformation at branch (both "
-                                   "concrete and concrete/symbolic)"),
-        clEnumValEnd),
+                                   "concrete and concrete/symbolic)")
+        KLEE_LLVM_CL_VAL_END),
     llvm::cl::init(NONE),
     llvm::cl::desc("Optimize accesses to either concrete or concrete/symbolic "
                    "arrays. (default=off)"));