diff options
| author | Martin Nowack <martin.nowack@gmail.com> | 2013-08-29 16:36:29 +0200 |
|---|---|---|
| committer | Martin Nowack <martin.nowack@gmail.com> | 2013-08-29 16:36:29 +0200 |
| commit | aa141a92a90001aa1606db474a08a2c4caed1800 (patch) | |
| tree | 1759e0af5730df205646126d1eca36248f24ef90 | |
| parent | 565b8567b616988d5f1269ac6fc8418c542563c4 (diff) | |
| download | klee-aa141a92a90001aa1606db474a08a2c4caed1800.tar.gz | |
Revert "Use new PathV2 interface for LLVM 2.9 and higher"
This reverts commit 5c059018c02a7c7db252a3cb636a39c89c430a06.
| -rw-r--r-- | lib/Core/StatsTracker.cpp | 11 | ||||
| -rw-r--r-- | tools/klee/main.cpp | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/lib/Core/StatsTracker.cpp b/lib/Core/StatsTracker.cpp index ae9910e5..c0028a05 100644 --- a/lib/Core/StatsTracker.cpp +++ b/lib/Core/StatsTracker.cpp @@ -38,12 +38,17 @@ #include "llvm/Support/CFG.h" #if LLVM_VERSION_CODE < LLVM_VERSION(2, 9) #include "llvm/System/Process.h" -#include "llvm/System/Path.h" #else #include "llvm/Support/Process.h" +#endif +#if LLVM_VERSION_CODE < LLVM_VERSION(2, 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> #include <fstream> @@ -175,14 +180,14 @@ StatsTracker::StatsTracker(Executor &_executor, std::string _objectFilename, KModule *km = executor.kmodule; sys::Path module(objectFilename); -#if LLVM_VERSION_CODE < LLVM_VERSION(2, 9) +#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(2, 9) +#if LLVM_VERSION_CODE < LLVM_VERSION(3, 1) if (current.exists()) #else if (sys::fs::exists(current.c_str())) diff --git a/tools/klee/main.cpp b/tools/klee/main.cpp index 42c0c4ba..92e4df67 100644 --- a/tools/klee/main.cpp +++ b/tools/klee/main.cpp @@ -303,7 +303,7 @@ KleeHandler::KleeHandler(int argc, char **argv) } sys::Path p(theDir); -#if LLVM_VERSION_CODE < LLVM_VERSION(2, 9) +#if LLVM_VERSION_CODE < LLVM_VERSION(3, 1) if (!p.isAbsolute()) { #else if (!sys::path::is_absolute(p.c_str())) { |