From 8cb0d545138cbb876318ed6d578b2b6a6a92b81a Mon Sep 17 00:00:00 2001 From: Frank Busse Date: Fri, 4 Sep 2020 10:24:33 +0100 Subject: MergingSearcher: remove random-path incompatibility --- lib/Core/UserSearcher.cpp | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'lib/Core') diff --git a/lib/Core/UserSearcher.cpp b/lib/Core/UserSearcher.cpp index 7acca58e..e1534f70 100644 --- a/lib/Core/UserSearcher.cpp +++ b/lib/Core/UserSearcher.cpp @@ -13,7 +13,6 @@ #include "MergeHandler.h" #include "Searcher.h" -#include "klee/Solver/SolverCmdLine.h" #include "klee/Support/ErrorHandling.h" #include "llvm/Support/CommandLine.h" @@ -98,10 +97,10 @@ void klee::initializeSearchOptions() { bool klee::userSearcherRequiresMD2U() { return (std::find(CoreSearch.begin(), CoreSearch.end(), Searcher::NURS_MD2U) != CoreSearch.end() || - std::find(CoreSearch.begin(), CoreSearch.end(), Searcher::NURS_CovNew) != CoreSearch.end() || - std::find(CoreSearch.begin(), CoreSearch.end(), Searcher::NURS_ICnt) != CoreSearch.end() || - std::find(CoreSearch.begin(), CoreSearch.end(), Searcher::NURS_CPICnt) != CoreSearch.end() || - std::find(CoreSearch.begin(), CoreSearch.end(), Searcher::NURS_QC) != CoreSearch.end()); + std::find(CoreSearch.begin(), CoreSearch.end(), Searcher::NURS_CovNew) != CoreSearch.end() || + std::find(CoreSearch.begin(), CoreSearch.end(), Searcher::NURS_ICnt) != CoreSearch.end() || + std::find(CoreSearch.begin(), CoreSearch.end(), Searcher::NURS_CPICnt) != CoreSearch.end() || + std::find(CoreSearch.begin(), CoreSearch.end(), Searcher::NURS_QC) != CoreSearch.end()); } @@ -148,12 +147,6 @@ Searcher *klee::constructUserSearcher(Executor &executor) { } if (UseMerge) { - if (std::find(CoreSearch.begin(), CoreSearch.end(), Searcher::RandomPath) != - CoreSearch.end()) { - klee_error("use-merge currently does not support random-path, please use " - "another search strategy"); - } - auto *ms = new MergingSearcher(searcher); executor.setMergingSearcher(ms); -- cgit 1.4.1