Silenced two "control may reach end of non-void function [-Wreturn-type]" compiler warnings, one by adding an assert, and the other by refactoring the choose() function.

1 files changed, 6 insertions, 1 deletions

diff --git a/lib/Core/ExecutorUtil.cpp b/lib/Core/ExecutorUtil.cpp
index 56f18e6b..b91b5dee 100644
--- a/lib/Core/ExecutorUtil.cpp
+++ b/lib/Core/ExecutorUtil.cpp
@@ -153,6 +153,11 @@ namespace klee {
     case Instruction::FCmp:
       assert(0 && "floating point ConstantExprs unsupported");
     }
+#if LLVM_VERSION_CODE >= LLVM_VERSION(3, 1)
+    llvm_unreachable("Unsupported expression in evalConstantExpr");
+#else
+    assert(0 && "Unsupported expression in evalConstantExpr");
+#endif
+    return op1;
   }
-
 }