Merge branch 'CompilerWarnings' of https://github.com/MartinNowack/klee into MartinNowack-CompilerWarnings

6 files changed, 17 insertions, 8 deletions

diff --git a/lib/Core/Executor.cpp b/lib/Core/Executor.cpp
index 88ede5c8..069022a2 100644
--- a/lib/Core/Executor.cpp
+++ b/lib/Core/Executor.cpp
@@ -425,17 +425,17 @@ void Executor::initializeGlobals(ExecutionState &state) {
        char' value [0,255]; by EOF (-1); or by any `signed char' value
        [-128,-1).  ISO C requires that the ctype functions work for `unsigned */
   const uint16_t **addr = __ctype_b_loc();
-  addExternalObject(state, (void *)(*addr-128), 
+  addExternalObject(state, const_cast<uint16_t*>(*addr-128),
                     384 * sizeof **addr, true);
   addExternalObject(state, addr, sizeof(*addr), true);
     
   const int32_t **lower_addr = __ctype_tolower_loc();
-  addExternalObject(state, (void *)(*lower_addr-128), 
+  addExternalObject(state, const_cast<int32_t*>(*lower_addr-128),
                     384 * sizeof **lower_addr, true);
   addExternalObject(state, lower_addr, sizeof(*lower_addr), true);
   
   const int32_t **upper_addr = __ctype_toupper_loc();
-  addExternalObject(state, (void *)(*upper_addr-128), 
+  addExternalObject(state, const_cast<int32_t*>(*upper_addr-128),
                     384 * sizeof **upper_addr, true);
   addExternalObject(state, upper_addr, sizeof(*upper_addr), true);
 #endif
diff --git a/lib/Core/StatsTracker.cpp b/lib/Core/StatsTracker.cpp
index f81d19d8..c0028a05 100644
--- a/lib/Core/StatsTracker.cpp
+++ b/lib/Core/StatsTracker.cpp
@@ -45,6 +45,9 @@
 #include "llvm/System/Path.h"
 #else
 #include "llvm/Support/Path.h"
+#if LLVM_VERSION_CODE >= LLVM_VERSION(3, 1)
+#include "llvm/Support/FileSystem.h"
+#endif
 #endif
 
 #include <iostream>
@@ -177,10 +180,18 @@ StatsTracker::StatsTracker(Executor &_executor, std::string _objectFilename,
   KModule *km = executor.kmodule;
 
   sys::Path module(objectFilename);
+#if LLVM_VERSION_CODE < LLVM_VERSION(3, 1)
   if (!sys::Path(objectFilename).isAbsolute()) {
+#else
+  if (!sys::path::is_absolute(objectFilename)) {
+#endif
     sys::Path current = sys::Path::GetCurrentDirectory();
     current.appendComponent(objectFilename);
+#if LLVM_VERSION_CODE < LLVM_VERSION(3, 1)
     if (current.exists())
+#else
+    if (sys::fs::exists(current.c_str()))
+#endif
       objectFilename = current.c_str();
   }
 
diff --git a/lib/Expr/Expr.cpp b/lib/Expr/Expr.cpp
index 1187573b..a28ad907 100644
--- a/lib/Expr/Expr.cpp
+++ b/lib/Expr/Expr.cpp
@@ -342,7 +342,7 @@ void ConstantExpr::toMemory(void *address) {
   case Expr::Int64: *((uint64_t*) address) = getZExtValue(64); break;
   // FIXME: what about machines without x87 support?
   case Expr::Fl80:
-    *((long double*) address) = *(long double*) value.getRawData();
+    *((long double*) address) = *(const long double*) value.getRawData();
     break;
   }
 }
diff --git a/lib/Expr/Lexer.cpp b/lib/Expr/Lexer.cpp
index 95d6072b..9859ff36 100644
--- a/lib/Expr/Lexer.cpp
+++ b/lib/Expr/Lexer.cpp
@@ -54,7 +54,7 @@ const char *Token::getKindName() const {
 
 void Token::dump() {
   llvm::errs() << "(Token \"" << getKindName() << "\" "
-               << (void*) start << " " << length << " "
+               << (const void*) start << " " << length << " "
                << line << " " << column << ")";
 }
 
diff --git a/lib/Module/KModule.cpp b/lib/Module/KModule.cpp
index ea86433e..1629bb79 100644
--- a/lib/Module/KModule.cpp
+++ b/lib/Module/KModule.cpp
@@ -390,7 +390,6 @@ void KModule::prepare(const Interpreter::ModuleOptions &opts,
     if (NoTruncateSourceLines) {
       *ros << *module;
     } else {
-      bool truncated = false;
       std::string string;
       llvm::raw_string_ostream rss(string);
       rss << *module;
@@ -409,7 +408,6 @@ void KModule::prepare(const Interpreter::ModuleOptions &opts,
           } else {
             ros->write(position, 254);
             *ros << "\n";
-            truncated = true;
           }
           position = end+1;
         }
diff --git a/lib/Solver/STPBuilder.cpp b/lib/Solver/STPBuilder.cpp
index 789eb244..90252656 100644
--- a/lib/Solver/STPBuilder.cpp
+++ b/lib/Solver/STPBuilder.cpp
@@ -435,7 +435,7 @@ ExprHandle STPBuilder::constructSDivByConstant(ExprHandle expr_n, unsigned width
     // STP uniques arrays by name, so we make sure the name is unique by
     // including the address.
     char buf[32];
-    unsigned const addrlen = sprintf(buf, "_%p", (void*)root) + 1; // +1 for null-termination
+    unsigned const addrlen = sprintf(buf, "_%p", (const void*)root) + 1; // +1 for null-termination
     unsigned const space = (root->name.length() > 32 - addrlen)?(32 - addrlen):root->name.length();
     memmove(buf + space, buf, addrlen); // moving the address part to the end
     memcpy(buf, root->name.c_str(), space); // filling out the name part