about summary refs log tree commit diff homepage
path: root/include
diff options
context:
space:
mode:
authorLukas Wölfer <lukas.woelfer@rwth-aachen.de>2017-06-24 18:59:27 +0200
committerDan Liew <delcypher@gmail.com>2017-08-04 11:52:03 +0100
commitfff6485e2f3ec82b6cb31e1f5038adef09be7eed (patch)
tree91ccb200f906f9314f79e4bb11037b2948a641e2 /include
parenta4ed54c2b8228a30785c11d7542427a1bd1f7292 (diff)
downloadklee-fff6485e2f3ec82b6cb31e1f5038adef09be7eed.tar.gz
Removed merging searchers
Diffstat (limited to 'include')
-rw-r--r--include/klee/Internal/Module/KModule.h3
-rw-r--r--include/klee/klee.h2
2 files changed, 0 insertions, 5 deletions
diff --git a/include/klee/Internal/Module/KModule.h b/include/klee/Internal/Module/KModule.h
index 41253383..e8ded725 100644
--- a/include/klee/Internal/Module/KModule.h
+++ b/include/klee/Internal/Module/KModule.h
@@ -82,9 +82,6 @@ namespace klee {
   public:
     llvm::Module *module;
     llvm::DataLayout *targetData;
-    
-    // Some useful functions to know the address of
-    llvm::Function *kleeMergeFn;
 
     // Our shadow versions of LLVM structures.
     std::vector<KFunction*> functions;
diff --git a/include/klee/klee.h b/include/klee/klee.h
index d0980395..bd3100b5 100644
--- a/include/klee/klee.h
+++ b/include/klee/klee.h
@@ -152,8 +152,6 @@ extern "C" {
   /* Print range for given argument and tagged with name */
   void klee_print_range(const char * name, int arg );
 
-  /* Merge current states together if possible */
-  void klee_merge();
 #ifdef __cplusplus
 }
 #endif