diff options
author | Dan Liew <daniel.liew@imperial.ac.uk> | 2017-05-24 17:38:12 +0100 |
---|---|---|
committer | Dan Liew <delcypher@gmail.com> | 2017-06-01 11:36:09 +0100 |
commit | 31e75fdf1e277bbf961287706b06eab8136c6cd0 (patch) | |
tree | d7e845e2b3fbe7c59bb6e5be38ce452c01723ffd /tools | |
parent | 9a73071e22b408bb9bf5c24ec2d7eeb3a8a16e96 (diff) | |
download | klee-31e75fdf1e277bbf961287706b06eab8136c6cd0.tar.gz |
Refactor file opening code out of `main.cpp` and into
`klee_open_output_file()` function so that it can be used by the Z3Solver.
Diffstat (limited to 'tools')
-rw-r--r-- | tools/klee/main.cpp | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/tools/klee/main.cpp b/tools/klee/main.cpp index a91c9fd1..9e36f949 100644 --- a/tools/klee/main.cpp +++ b/tools/klee/main.cpp @@ -9,18 +9,19 @@ // //===----------------------------------------------------------------------===// +#include "klee/Config/Version.h" #include "klee/ExecutionState.h" #include "klee/Expr.h" -#include "klee/Interpreter.h" -#include "klee/Statistics.h" -#include "klee/Config/Version.h" #include "klee/Internal/ADT/KTest.h" #include "klee/Internal/ADT/TreeStream.h" #include "klee/Internal/Support/Debug.h" +#include "klee/Internal/Support/ErrorHandling.h" +#include "klee/Internal/Support/FileHandling.h" #include "klee/Internal/Support/ModuleUtil.h" -#include "klee/Internal/System/Time.h" #include "klee/Internal/Support/PrintVersion.h" -#include "klee/Internal/Support/ErrorHandling.h" +#include "klee/Internal/System/Time.h" +#include "klee/Interpreter.h" +#include "klee/Statistics.h" #if LLVM_VERSION_CODE > LLVM_VERSION(3, 2) #include "llvm/IR/Constants.h" @@ -385,27 +386,14 @@ llvm::raw_fd_ostream *KleeHandler::openOutputFile(const std::string &filename) { llvm::raw_fd_ostream *f; std::string Error; std::string path = getOutputFilename(filename); -#if LLVM_VERSION_CODE >= LLVM_VERSION(3, 6) - std::error_code ec; - f = new llvm::raw_fd_ostream(path.c_str(), ec, llvm::sys::fs::F_None); - if (ec) - Error = ec.message(); -#elif LLVM_VERSION_CODE >= LLVM_VERSION(3, 5) - f = new llvm::raw_fd_ostream(path.c_str(), Error, llvm::sys::fs::F_None); -#elif LLVM_VERSION_CODE >= LLVM_VERSION(3,4) - f = new llvm::raw_fd_ostream(path.c_str(), Error, llvm::sys::fs::F_Binary); -#else - f = new llvm::raw_fd_ostream(path.c_str(), Error, llvm::raw_fd_ostream::F_Binary); -#endif + f = klee_open_output_file(path, Error); if (!Error.empty()) { klee_warning("error opening file \"%s\". KLEE may have run out of file " - "descriptors: try to increase the maximum number of open file " - "descriptors by using ulimit (%s).", - filename.c_str(), Error.c_str()); - delete f; - f = NULL; + "descriptors: try to increase the maximum number of open file " + "descriptors by using ulimit (%s).", + path.c_str(), Error.c_str()); + return NULL; } - return f; } |