diff options
| -rw-r--r-- | include/klee/Config/Version.h | 6 | ||||
| -rw-r--r-- | lib/Core/ExternalDispatcher.cpp | 1 | ||||
| -rw-r--r-- | lib/Module/IntrinsicCleaner.cpp | 12 |
3 files changed, 15 insertions, 4 deletions
diff --git a/include/klee/Config/Version.h b/include/klee/Config/Version.h index ccf54ae1..53205160 100644 --- a/include/klee/Config/Version.h +++ b/include/klee/Config/Version.h @@ -15,6 +15,12 @@ #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 70c14050..72b866cf 100644 --- a/lib/Core/ExternalDispatcher.cpp +++ b/lib/Core/ExternalDispatcher.cpp @@ -326,6 +326,7 @@ Function *ExternalDispatcherImpl::createDispatcher(Function *target, Type *argTy = (i < FTy->getNumParams() ? FTy->getParamType(i) : (*ai)->getType()); Instruction *argI64p = GetElementPtrInst::Create( + KLEE_LLVM_GEP_TYPE(nullptr) argI64s, ConstantInt::get(Type::getInt32Ty(ctx), idx), "", dBB); Instruction *argp = diff --git a/lib/Module/IntrinsicCleaner.cpp b/lib/Module/IntrinsicCleaner.cpp index 2ac9db62..3729ff82 100644 --- a/lib/Module/IntrinsicCleaner.cpp +++ b/lib/Module/IntrinsicCleaner.cpp @@ -86,12 +86,16 @@ bool IntrinsicCleanerPass::runOnBasicBlock(BasicBlock &b, Module &M) { Value *val = new LoadInst(pSrc, std::string(), ii); new StoreInst(val, pDst, ii); Value *off = ConstantInt::get(Type::getInt64Ty(ctx), 1); - pDst = GetElementPtrInst::Create(pDst, off, std::string(), ii); - pSrc = GetElementPtrInst::Create(pSrc, off, std::string(), ii); + pDst = GetElementPtrInst::Create(KLEE_LLVM_GEP_TYPE(nullptr) + pDst, off, std::string(), ii); + pSrc = GetElementPtrInst::Create(KLEE_LLVM_GEP_TYPE(nullptr) + pSrc, off, std::string(), ii); val = new LoadInst(pSrc, std::string(), ii); new StoreInst(val, pDst, ii); - pDst = GetElementPtrInst::Create(pDst, off, std::string(), ii); - pSrc = GetElementPtrInst::Create(pSrc, off, std::string(), ii); + pDst = GetElementPtrInst::Create(KLEE_LLVM_GEP_TYPE(nullptr) + pDst, off, std::string(), ii); + pSrc = GetElementPtrInst::Create(KLEE_LLVM_GEP_TYPE(nullptr) + pSrc, off, std::string(), ii); val = new LoadInst(pSrc, std::string(), ii); new StoreInst(val, pDst, ii); } |