Skip to content

Commit c6d3055

Browse files
Make symex_transition static
This does not use any field and is not overriden.
1 parent f5eedc4 commit c6d3055

File tree

2 files changed

+17
-16
lines changed

2 files changed

+17
-16
lines changed

src/goto-symex/goto_symex.h

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -238,19 +238,6 @@ class goto_symext
238238

239239
const irep_idt guard_identifier;
240240

241-
// symex
242-
virtual void symex_transition(
243-
statet &,
244-
goto_programt::const_targett to,
245-
bool is_backwards_goto);
246-
247-
virtual void symex_transition(statet &state)
248-
{
249-
goto_programt::const_targett next=state.source.pc;
250-
++next;
251-
symex_transition(state, next, false);
252-
}
253-
254241
virtual void symex_goto(statet &);
255242
virtual void symex_start_thread(statet &);
256243
virtual void symex_atomic_begin(statet &);
@@ -465,4 +452,11 @@ class goto_symext
465452
}
466453
};
467454

455+
void symex_transition(goto_symext::statet &state);
456+
457+
void symex_transition(
458+
goto_symext::statet &,
459+
goto_programt::const_targett to,
460+
bool is_backwards_goto);
461+
468462
#endif // CPROVER_GOTO_SYMEX_GOTO_SYMEX_H

src/goto-symex/symex_main.cpp

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ Author: Daniel Kroening, [email protected]
2222

2323
#include <analyses/dirty.h>
2424

25-
void goto_symext::symex_transition(
26-
statet &state,
25+
void symex_transition(
26+
goto_symext::statet &state,
2727
goto_programt::const_targett to,
2828
bool is_backwards_goto)
2929
{
@@ -34,7 +34,7 @@ void goto_symext::symex_transition(
3434
// 1. the transition from state.source.pc to "to" is not a backwards goto
3535
// or
3636
// 2. we are arriving from an outer loop
37-
statet::framet &frame=state.top();
37+
goto_symext::statet::framet &frame = state.top();
3838
const goto_programt::instructiont &instruction=*to;
3939
for(const auto &i_e : instruction.incoming_edges)
4040
if(i_e->is_goto() && i_e->is_backwards_goto() &&
@@ -46,6 +46,13 @@ void goto_symext::symex_transition(
4646
state.source.pc=to;
4747
}
4848

49+
void symex_transition(goto_symext::statet &state)
50+
{
51+
goto_programt::const_targett next = state.source.pc;
52+
++next;
53+
symex_transition(state, next, false);
54+
}
55+
4956
void goto_symext::vcc(
5057
const exprt &vcc_expr,
5158
const std::string &msg,

0 commit comments

Comments
 (0)