From 4a9a908739d7d7c833e7985ea7465d95c0dd0b82 Mon Sep 17 00:00:00 2001 From: Dan Liew Date: Wed, 2 Apr 2014 21:44:51 +0100 Subject: Tidy up code by using LLVM's V2 path API only and removing uses of old V1 path API. LLVM2.9 supports LLVM's V2 path API. Because that is the minimum version we support we should just use this API everywhere so we reduce the number of #if LLVM_VERSION_CODE macros and duplicated code. --- lib/Core/StatsTracker.cpp | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) (limited to 'lib/Core') diff --git a/lib/Core/StatsTracker.cpp b/lib/Core/StatsTracker.cpp index fde2eae8..1bb9885a 100644 --- a/lib/Core/StatsTracker.cpp +++ b/lib/Core/StatsTracker.cpp @@ -49,9 +49,7 @@ #include "llvm/Support/raw_os_ostream.h" #include "llvm/Support/Process.h" #include "llvm/Support/Path.h" -#if LLVM_VERSION_CODE >= LLVM_VERSION(3, 1) #include "llvm/Support/FileSystem.h" -#endif #include #include @@ -183,27 +181,15 @@ StatsTracker::StatsTracker(Executor &_executor, std::string _objectFilename, updateMinDistToUncovered(_updateMinDistToUncovered) { KModule *km = executor.kmodule; -#if LLVM_VERSION_CODE < LLVM_VERSION(3, 1) - if (!sys::Path(objectFilename).isAbsolute()) { -#else if (!sys::path::is_absolute(objectFilename)) { -#endif - -#if LLVM_VERSION_CODE < LLVM_VERSION(3,4) - sys::Path current = sys::Path::GetCurrentDirectory(); - current.appendComponent(objectFilename); -#if LLVM_VERSION_CODE < LLVM_VERSION(3, 1) - if (current.exists()) -#else - if (sys::fs::exists(current.c_str())) -#endif - objectFilename = current.c_str(); -#else SmallString<128> current(objectFilename); - if(sys::fs::make_absolute(current) && sys::fs::exists(current.str())) - objectFilename = current.c_str(); -#endif - + if(sys::fs::make_absolute(current)) { + bool exists = false; + error_code ec = sys::fs::exists(current.str(), exists); + if (ec == errc::success && exists) { + objectFilename = current.c_str(); + } + } } if (OutputIStats) -- cgit 1.4.1