about summary refs log tree commit diff homepage
diff options
context:
space:
mode:
authorJulian Büning <julian.buening@rwth-aachen.de>2019-03-20 21:22:55 +0100
committerMartinNowack <martin.nowack@gmail.com>2019-03-21 12:46:01 +0000
commit539323d70215d0248303078f9c400a88dfeb8012 (patch)
tree3a64bb9f6f3f572b402ab0ca6d693ccae85df8a3
parent887d48856f0bbfc5adfa1caea029d938a1ecb342 (diff)
downloadklee-539323d70215d0248303078f9c400a88dfeb8012.tar.gz
remove obsolete macro KLEE_LLVM_GEP_TYPE
-rw-r--r--include/klee/Config/Version.h6
-rw-r--r--lib/Core/ExternalDispatcher.cpp2
-rw-r--r--lib/Module/IntrinsicCleaner.cpp12
3 files changed, 5 insertions, 15 deletions
diff --git a/include/klee/Config/Version.h b/include/klee/Config/Version.h
index a02ce28b..ac889373 100644
--- a/include/klee/Config/Version.h
+++ b/include/klee/Config/Version.h
@@ -15,12 +15,6 @@
 #define LLVM_VERSION(major, minor) (((major) << 8) | (minor))
 #define LLVM_VERSION_CODE LLVM_VERSION(LLVM_VERSION_MAJOR, LLVM_VERSION_MINOR)
 
-#if LLVM_VERSION_CODE >= LLVM_VERSION(3, 7)
-#  define KLEE_LLVM_GEP_TYPE(x) (x),
-#else
-#  define KLEE_LLVM_GEP_TYPE(x)
-#endif
-
 #if LLVM_VERSION_CODE >= LLVM_VERSION(4, 0)
 #  define KLEE_LLVM_CL_VAL_END
 #else
diff --git a/lib/Core/ExternalDispatcher.cpp b/lib/Core/ExternalDispatcher.cpp
index 60bdf711..28bc1898 100644
--- a/lib/Core/ExternalDispatcher.cpp
+++ b/lib/Core/ExternalDispatcher.cpp
@@ -330,7 +330,7 @@ Function *ExternalDispatcherImpl::createDispatcher(Function *target,
     auto argTy =
         (i < FTy->getNumParams() ? FTy->getParamType(i) : (*ai)->getType());
     auto argI64p =
-        Builder.CreateGEP(KLEE_LLVM_GEP_TYPE(nullptr) argI64s,
+        Builder.CreateGEP(nullptr, argI64s,
                           ConstantInt::get(Type::getInt32Ty(ctx), idx));
 
     auto argp = Builder.CreateBitCast(argI64p, PointerType::getUnqual(argTy));
diff --git a/lib/Module/IntrinsicCleaner.cpp b/lib/Module/IntrinsicCleaner.cpp
index cb006799..4c0920b3 100644
--- a/lib/Module/IntrinsicCleaner.cpp
+++ b/lib/Module/IntrinsicCleaner.cpp
@@ -89,16 +89,12 @@ bool IntrinsicCleanerPass::runOnBasicBlock(BasicBlock &b, Module &M) {
           Builder.CreateStore(val, pDst, ii);
 
           auto off = ConstantInt::get(Type::getInt64Ty(ctx), 1);
-          pDst = Builder.CreateGEP(KLEE_LLVM_GEP_TYPE(nullptr) pDst, off,
-                                   std::string());
-          pSrc = Builder.CreateGEP(KLEE_LLVM_GEP_TYPE(nullptr) pSrc, off,
-                                   std::string());
+          pDst = Builder.CreateGEP(nullptr, pDst, off, std::string());
+          pSrc = Builder.CreateGEP(nullptr, pSrc, off, std::string());
           val = Builder.CreateLoad(pSrc, std::string());
           Builder.CreateStore(val, pDst);
-          pDst = Builder.CreateGEP(KLEE_LLVM_GEP_TYPE(nullptr) pDst, off,
-                                   std::string());
-          pSrc = Builder.CreateGEP(KLEE_LLVM_GEP_TYPE(nullptr) pSrc, off,
-                                   std::string());
+          pDst = Builder.CreateGEP(nullptr, pDst, off, std::string());
+          pSrc = Builder.CreateGEP(nullptr, pSrc, off, std::string());
           val = Builder.CreateLoad(pSrc, std::string());
           Builder.CreateStore(val, pDst);
         }