diff options
| author | Lukas Wölfer <lukas.woelfer@rwth-aachen.de> | 2017-06-24 19:59:48 +0200 |
|---|---|---|
| committer | Cristian Cadar <c.cadar@imperial.ac.uk> | 2017-11-30 12:18:15 +0000 |
| commit | 60b5c574ea565b3132cc60d946d87a4d1243801b (patch) | |
| tree | c7b781fe9aa8c1fdf5b4753ddaa2c694d8878b99 /lib/Core/Executor.cpp | |
| parent | bc84fb1f642cbd15064c86d3839e278be536b254 (diff) | |
| download | klee-60b5c574ea565b3132cc60d946d87a4d1243801b.tar.gz | |
Implemented bounded merging functionality
Diffstat (limited to 'lib/Core/Executor.cpp')
| -rw-r--r-- | lib/Core/Executor.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/Core/Executor.cpp b/lib/Core/Executor.cpp index e79d6a2c..be92b16a 100644 --- a/lib/Core/Executor.cpp +++ b/lib/Core/Executor.cpp @@ -2456,7 +2456,7 @@ void Executor::executeInstruction(ExecutionState &state, KInstruction *ki) { void Executor::updateStates(ExecutionState *current) { if (searcher) { searcher->update(current, addedStates, removedStates); - searcher->update(0, continuedStates, pausedStates); + searcher->update(nullptr, continuedStates, pausedStates); pausedStates.clear(); continuedStates.clear(); } @@ -2745,7 +2745,7 @@ std::string Executor::getAddressInfo(ExecutionState &state, } void Executor::pauseState(ExecutionState &state){ - std::vector<ExecutionState *>::iterator it = std::find(continuedStates.begin(), continuedStates.end(), &state); + auto it = std::find(continuedStates.begin(), continuedStates.end(), &state); // If the state was to be continued, but now gets paused again if (it != continuedStates.end()){ // ...just don't continue it @@ -2757,7 +2757,7 @@ void Executor::pauseState(ExecutionState &state){ } void Executor::continueState(ExecutionState &state){ - std::vector<ExecutionState *>::iterator it = std::find(pausedStates.begin(), pausedStates.end(), &state); + auto it = std::find(pausedStates.begin(), pausedStates.end(), &state); // If the state was to be paused, but now gets continued again if (it != pausedStates.end()){ // ...don't pause it @@ -2768,7 +2768,6 @@ void Executor::continueState(ExecutionState &state){ } } - void Executor::terminateState(ExecutionState &state) { if (replayKTest && replayPosition!=replayKTest->numObjects) { klee_warning_once(replayKTest, |