From aa141a92a90001aa1606db474a08a2c4caed1800 Mon Sep 17 00:00:00 2001 From: Martin Nowack Date: Thu, 29 Aug 2013 16:36:29 +0200 Subject: Revert "Use new PathV2 interface for LLVM 2.9 and higher" This reverts commit 5c059018c02a7c7db252a3cb636a39c89c430a06. --- lib/Core/StatsTracker.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'lib') 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 #include @@ -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())) -- cgit 1.4.1