From 141f052a488c5b76adc658a185032c62d6244b9c Mon Sep 17 00:00:00 2001 From: Cristian Cadar Date: Fri, 3 Apr 2015 12:36:08 +0100 Subject: Fixed issue introduce during a previous refactoring, related to field ordering. --- include/klee/ExecutionState.h | 10 +++++----- lib/Core/ExecutionState.cpp | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/klee/ExecutionState.h b/include/klee/ExecutionState.h index 067a80a2..32f840f6 100644 --- a/include/klee/ExecutionState.h +++ b/include/klee/ExecutionState.h @@ -75,13 +75,13 @@ private: public: // Execution - Control Flow specific - /// @brief Pointer to instruction which is currently executed - KInstIterator prevPC; - /// @brief Pointer to instruction to be executed after the current /// instruction KInstIterator pc; + /// @brief Pointer to instruction which is currently executed + KInstIterator prevPC; + /// @brief Stack representing the current instruction stream stack_ty stack; @@ -109,11 +109,11 @@ public: /// @brief Exploration depth, i.e., number of times KLEE branched for this state unsigned depth; - /// @brief History of complete path: Represents branches taken to + /// @brief History of complete path: represents branches taken to /// reach/create this state (both concrete and symbolic) TreeOStream pathOS; - /// @brief History of symbolic path: Represents symbolic branches + /// @brief History of symbolic path: represents symbolic branches /// taken to reach/create this state TreeOStream symPathOS; diff --git a/lib/Core/ExecutionState.cpp b/lib/Core/ExecutionState.cpp index 596a3475..6aeaa833 100644 --- a/lib/Core/ExecutionState.cpp +++ b/lib/Core/ExecutionState.cpp @@ -67,8 +67,8 @@ StackFrame::~StackFrame() { /***/ ExecutionState::ExecutionState(KFunction *kf) : - prevPC(pc), pc(kf->instructions), + prevPC(pc), queryCost(0.), weight(1), @@ -99,8 +99,8 @@ ExecutionState::~ExecutionState() { ExecutionState::ExecutionState(const ExecutionState& state): fnAliases(state.fnAliases), - prevPC(state.prevPC), pc(state.pc), + prevPC(state.prevPC), stack(state.stack), incomingBBIndex(state.incomingBBIndex), -- cgit 1.4.1