diff options
| author | Frank Busse <bb0xfb@gmail.com> | 2022-06-13 10:42:51 +0100 |
|---|---|---|
| committer | MartinNowack <2443641+MartinNowack@users.noreply.github.com> | 2022-06-30 10:02:30 +0100 |
| commit | 6cc8ee707c1b4337120aa2972e2ad13a4861bbc3 (patch) | |
| tree | 52aa6fc4f793239963679550e673b6f3a18c3e71 /include | |
| parent | b8539333fdaf32b0f4911d6569ad56a0443190bb (diff) | |
| download | klee-6cc8ee707c1b4337120aa2972e2ad13a4861bbc3.tar.gz | |
remove LLVM < 9
Diffstat (limited to 'include')
| -rw-r--r-- | include/klee/Config/config.h.cmin | 3 | ||||
| -rw-r--r-- | include/klee/Support/Casting.h | 7 | ||||
| -rw-r--r-- | include/klee/Support/ModuleUtil.h | 20 |
3 files changed, 5 insertions, 25 deletions
diff --git a/include/klee/Config/config.h.cmin b/include/klee/Config/config.h.cmin index b9fdf7c3..24dc87e8 100644 --- a/include/klee/Config/config.h.cmin +++ b/include/klee/Config/config.h.cmin @@ -86,9 +86,6 @@ /* Define to the version of this package. */ #cmakedefine PACKAGE_VERSION @PACKAGE_VERSION@ -/* Use Workaround for LLVM PR39177 (affecting LLVM 3.9 - 7.0.0) */ -#cmakedefine USE_WORKAROUND_LLVM_PR39177 @USE_WORKAROUND_LLVM_PR39177@ - /* libcxx is supported */ #cmakedefine SUPPORT_KLEE_LIBCXX @SUPPORT_KLEE_LIBCXX@ diff --git a/include/klee/Support/Casting.h b/include/klee/Support/Casting.h index 865218a0..5b04380e 100644 --- a/include/klee/Support/Casting.h +++ b/include/klee/Support/Casting.h @@ -21,14 +21,7 @@ using llvm::cast_or_null; using llvm::dyn_cast; using llvm::dyn_cast_or_null; using llvm::isa; -#if LLVM_VERSION_CODE >= LLVM_VERSION(9, 0) using llvm::isa_and_nonnull; -#else -template <typename... X, typename Y> -inline bool isa_and_nonnull(const Y &value) { - return value && isa<X...>(value); -} -#endif } // namespace klee diff --git a/include/klee/Support/ModuleUtil.h b/include/klee/Support/ModuleUtil.h index 40c58f4e..328b9aeb 100644 --- a/include/klee/Support/ModuleUtil.h +++ b/include/klee/Support/ModuleUtil.h @@ -12,11 +12,7 @@ #include "klee/Config/Version.h" -#if LLVM_VERSION_CODE >= LLVM_VERSION(8, 0) #include "llvm/IR/InstrTypes.h" -#else -#include "llvm/IR/CallSite.h" -#endif #include "llvm/IR/Module.h" #include <memory> @@ -44,17 +40,11 @@ linkModules(std::vector<std::unique_ptr<llvm::Module>> &modules, /// calls, although complicated constant expressions might be /// another possibility). /// -/// If `moduleIsFullyLinked` is set to true it will be assumed that the -/// module containing the `llvm::CallSite` (`llvm::CallBase` on LLVM 8+) -/// is fully linked. This assumption allows resolution of functions -/// that are marked as overridable. -llvm::Function *getDirectCallTarget( -#if LLVM_VERSION_CODE >= LLVM_VERSION(8, 0) - const llvm::CallBase &cb, -#else - const llvm::CallSite &cs, -#endif - bool moduleIsFullyLinked); +/// If `moduleIsFullyLinked` is set to true it will be assumed that the module +/// containing the `llvm::CallBase` is fully linked. This assumption allows +/// resolution of functions that are marked as overridable. +llvm::Function *getDirectCallTarget(const llvm::CallBase &cb, + bool moduleIsFullyLinked); /// Return true iff the given Function value is used in something /// other than a direct call (or a constant expression that |