From fcb5641d29b2e22bbd4034e51a1fe675b69bbf81 Mon Sep 17 00:00:00 2001
From: Julian Büning <julian.buening@rwth-aachen.de>
Date: Wed, 5 Jan 2022 22:36:18 +0100
Subject: LLVM < 6 leftovers

---
 cmake/find_llvm.cmake                              |  3 --
 lib/Core/Executor.cpp                              |  5 ----
 test/Intrinsics/objectsize.leq49.ll                | 33 ----------------------
 test/Intrinsics/objectsize.leq80.ll                |  2 --
 .../2019-08-02-missing-switch-default.ll           |  1 -
 5 files changed, 44 deletions(-)
 delete mode 100644 test/Intrinsics/objectsize.leq49.ll

diff --git a/cmake/find_llvm.cmake b/cmake/find_llvm.cmake
index c3acf112..0f80a28b 100644
--- a/cmake/find_llvm.cmake
+++ b/cmake/find_llvm.cmake
@@ -175,9 +175,6 @@ else()
     set(targets_to_return "")
     set(created_targets "")
     foreach (llvm_lib ${_llvm_libs_list})
-      # a bug in llvm-config from LLVM 3.9
-      string(REGEX REPLACE "lib(libLLVM[-.a-zA-Z0-9]+\\.so)\\.so$" "\\1" llvm_lib "${llvm_lib}")
-
       get_filename_component(llvm_lib_file_name "${llvm_lib}" NAME)
 
       string(REGEX REPLACE "^(lib)?(LLVM[-.a-zA-Z0-9]+)\\..+$" "\\2" target_name "${llvm_lib_file_name}")
diff --git a/lib/Core/Executor.cpp b/lib/Core/Executor.cpp
index 1f1fb18c..682711d3 100644
--- a/lib/Core/Executor.cpp
+++ b/lib/Core/Executor.cpp
@@ -778,12 +778,7 @@ void Executor::initializeGlobalAlias(const llvm::Constant *c) {
   }
 
   // resolve aliases in all sub-expressions
-#if LLVM_VERSION_CODE >= LLVM_VERSION(4, 0)
   for (const auto *op : c->operand_values()) {
-#else
-  for (auto &it : c->operands()) {
-    const auto *op = &*it;
-#endif
     initializeGlobalAlias(cast<Constant>(op));
   }
 
diff --git a/test/Intrinsics/objectsize.leq49.ll b/test/Intrinsics/objectsize.leq49.ll
deleted file mode 100644
index 0aa77816..00000000
--- a/test/Intrinsics/objectsize.leq49.ll
+++ /dev/null
@@ -1,33 +0,0 @@
-; REQUIRES: lt-llvm-5.0
-; RUN: %llvmas %s -o=%t.bc
-; RUN: rm -rf %t.klee-out
-; RUN: %klee -exit-on-error --output-dir=%t.klee-out --optimize=false %t.bc
-; ModuleID = 'objectsize.c'
-target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
-target triple = "x86_64-unknown-linux-gnu"
-
-define i32 @main() nounwind uwtable {
-entry:
-  %a = alloca i8*, align 8
-  %0 = load i8*, i8** %a, align 8
-  %1 = call i64 @llvm.objectsize.i64.p0i8(i8* %0, i1 true)
-  %cmp = icmp ne i64 %1, 0
-  br i1 %cmp, label %abort.block, label %continue.block
-
-continue.block:
-  %2 = load i8*, i8** %a, align 8
-  %3 = call i64 @llvm.objectsize.i64.p0i8(i8* %2, i1 false)
-  %cmp1 = icmp ne i64 %3, -1
-  br i1 %cmp1, label %abort.block, label %exit.block
-
-exit.block:
-  ret i32 0
-
-abort.block:
-  call void @abort()
-  unreachable
-}
-
-declare i64 @llvm.objectsize.i64.p0i8(i8*, i1) nounwind readnone
-
-declare void @abort() noreturn nounwind
diff --git a/test/Intrinsics/objectsize.leq80.ll b/test/Intrinsics/objectsize.leq80.ll
index 19a20334..ce2a2429 100644
--- a/test/Intrinsics/objectsize.leq80.ll
+++ b/test/Intrinsics/objectsize.leq80.ll
@@ -1,6 +1,4 @@
 ; REQUIRES: lt-llvm-9.0
-; LLVM 5 added parameter "nullunknown" to @llvm.objectsize
-; REQUIRES: geq-llvm-5.0
 ; RUN: %llvmas %s -o=%t.bc
 ; RUN: rm -rf %t.klee-out
 ; RUN: %klee -exit-on-error --output-dir=%t.klee-out --optimize=false %t.bc
diff --git a/test/regression/2019-08-02-missing-switch-default.ll b/test/regression/2019-08-02-missing-switch-default.ll
index 6adb8e19..b8a88db4 100644
--- a/test/regression/2019-08-02-missing-switch-default.ll
+++ b/test/regression/2019-08-02-missing-switch-default.ll
@@ -1,4 +1,3 @@
-; REQUIRES: geq-llvm-3.8
 ; RUN: rm -rf %t.klee-out
 ; RUN: llvm-as -f %s -o %t.bc
 ; RUN: %klee --switch-type=internal --output-dir=%t.klee-out %t.bc
-- 
cgit 1.4.1