From 5c059018c02a7c7db252a3cb636a39c89c430a06 Mon Sep 17 00:00:00 2001
From: Martin Nowack <martin.nowack@gmail.com>
Date: Thu, 29 Aug 2013 12:10:35 +0200
Subject: Use new PathV2 interface for LLVM 2.9 and higher

Enable PathV2 interface starting from LLVM 2.9 and do some minor include
cleanup.
---
 lib/Core/StatsTracker.cpp | 11 +++--------
 tools/klee/main.cpp       |  2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/lib/Core/StatsTracker.cpp b/lib/Core/StatsTracker.cpp
index c0028a05..ae9910e5 100644
--- a/lib/Core/StatsTracker.cpp
+++ b/lib/Core/StatsTracker.cpp
@@ -38,17 +38,12 @@
 #include "llvm/Support/CFG.h"
 #if LLVM_VERSION_CODE < LLVM_VERSION(2, 9)
 #include "llvm/System/Process.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/Process.h"
 #include "llvm/Support/Path.h"
-#if LLVM_VERSION_CODE >= LLVM_VERSION(3, 1)
 #include "llvm/Support/FileSystem.h"
 #endif
-#endif
 
 #include <iostream>
 #include <fstream>
@@ -180,14 +175,14 @@ StatsTracker::StatsTracker(Executor &_executor, std::string _objectFilename,
   KModule *km = executor.kmodule;
 
   sys::Path module(objectFilename);
-#if LLVM_VERSION_CODE < LLVM_VERSION(3, 1)
+#if LLVM_VERSION_CODE < LLVM_VERSION(2, 9)
   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(3, 1)
+#if LLVM_VERSION_CODE < LLVM_VERSION(2, 9)
     if (current.exists())
 #else
     if (sys::fs::exists(current.c_str()))
diff --git a/tools/klee/main.cpp b/tools/klee/main.cpp
index 0d899ae9..9060e354 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(3, 1)
+#if LLVM_VERSION_CODE < LLVM_VERSION(2, 9)
   if (!p.isAbsolute()) {
 #else
   if (!sys::path::is_absolute(p.c_str())) {
-- 
cgit 1.4.1