Merge pull request #94 from MartinNowack/fix_assert_library_linking

Fix assert library linking

2 files changed, 6 insertions, 3 deletions

diff --git a/lib/Module/KModule.cpp b/lib/Module/KModule.cpp
index 34e5f60c..2ecb14b8 100644
--- a/lib/Module/KModule.cpp
+++ b/lib/Module/KModule.cpp
@@ -182,7 +182,8 @@ static void injectStaticConstructorsAndDestructors(Module *m) {
   
   if (ctors || dtors) {
     Function *mainFn = m->getFunction("main");
-    assert(mainFn && "unable to find main function");
+    if (!mainFn)
+      klee_error("Could not find main() function.");
 
     if (ctors)
     CallInst::Create(getStubFunctionForCtorList(m, ctors, "klee.ctor_stub"),
diff --git a/lib/Module/ModuleUtil.cpp b/lib/Module/ModuleUtil.cpp
index fcdfa35a..9ae72936 100644
--- a/lib/Module/ModuleUtil.cpp
+++ b/lib/Module/ModuleUtil.cpp
@@ -9,6 +9,8 @@
 
 #include "klee/Internal/Support/ModuleUtil.h"
 #include "klee/Config/Version.h"
+// FIXME: This does not belong here.
+#include "../Core/Common.h"
 
 #if LLVM_VERSION_CODE >= LLVM_VERSION(3, 3)
 #include "llvm/Bitcode/ReaderWriter.h"
@@ -55,7 +57,7 @@ module->getContext());
 
   if (Linker::LinkModules(module, new_mod, Linker::DestroySource, 
 &err_str)) {
-    assert(0 && "linked in library failed!");
+    klee_error("Linking library %s failed", libraryName.c_str());
   }
 
   return module;
@@ -66,7 +68,7 @@ module->getContext());
   bool native = false;
     
   if (linker.LinkInFile(libraryPath, native)) {
-    assert(0 && "linking in library failed!");
+    klee_error("Linking library %s failed", libraryName.c_str());
   }
     
   return linker.releaseModule();