diff options
-rw-r--r-- | lib/Core/ExternalDispatcher.cpp | 6 | ||||
-rw-r--r-- | lib/Module/ModuleUtil.cpp | 18 |
2 files changed, 8 insertions, 16 deletions
diff --git a/lib/Core/ExternalDispatcher.cpp b/lib/Core/ExternalDispatcher.cpp index 9e3b0a49..eb60dcff 100644 --- a/lib/Core/ExternalDispatcher.cpp +++ b/lib/Core/ExternalDispatcher.cpp @@ -80,11 +80,7 @@ ExternalDispatcher::ExternalDispatcher() { if (executionEngine) { // Make sure we can resolve symbols in the program as well. The zero arg // to the function tells DynamicLibrary to load the program, not a library. - try { - dl_symbols.LoadLibraryPermanently(0); - } catch (...) { - assert(0 && "Exception in LoadLibraryPermantently.\n"); - } + dl_symbols.LoadLibraryPermanently(0); } #ifdef WINDOWS diff --git a/lib/Module/ModuleUtil.cpp b/lib/Module/ModuleUtil.cpp index d86b9d48..dae6ffc5 100644 --- a/lib/Module/ModuleUtil.cpp +++ b/lib/Module/ModuleUtil.cpp @@ -31,20 +31,16 @@ using namespace klee; Module *klee::linkWithLibrary(Module *module, const std::string &libraryName) { - try { - Linker linker("klee", module, false); + Linker linker("klee", module, false); - llvm::sys::Path libraryPath(libraryName); - bool native = false; + llvm::sys::Path libraryPath(libraryName); + bool native = false; - if (linker.LinkInFile(libraryPath, native)) { - assert(0 && "linking in library failed!"); - } - - return linker.releaseModule(); - } catch (...) { - assert(0 && "error during linking"); + if (linker.LinkInFile(libraryPath, native)) { + assert(0 && "linking in library failed!"); } + + return linker.releaseModule(); } Function *klee::getDirectCallTarget(const Instruction *i) { |