Skip to content

Commit 7f18bcf

Browse files
Make set_l1_indices static
This makes clearer what are the variables used and modified.
1 parent ceb30d2 commit 7f18bcf

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

src/goto-symex/goto_symex_state.cpp

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -246,15 +246,18 @@ static void set_l0_indices(
246246
level0(ssa_expr, ns, thread_nr);
247247
}
248248

249-
void goto_symex_statet::set_l1_indices(
249+
static void set_l1_indices(
250+
symex_level0t level0,
251+
symex_level1t level1,
250252
ssa_exprt &ssa_expr,
253+
unsigned int thread_nr,
251254
const namespacet &ns)
252255
{
253256
if(!ssa_expr.get_level_2().empty())
254257
return;
255258
if(!ssa_expr.get_level_1().empty())
256259
return;
257-
level0(ssa_expr, ns, source.thread_nr);
260+
level0(ssa_expr, ns, thread_nr);
258261
level1(ssa_expr);
259262
}
260263

@@ -289,13 +292,13 @@ void goto_symex_statet::rename(
289292
}
290293
else if(level == L1)
291294
{
292-
set_l1_indices(ssa, ns);
295+
set_l1_indices(level0, level1, ssa, source.thread_nr, ns);
293296
rename(expr.type(), ssa.get_identifier(), ns, level);
294297
ssa.update_type();
295298
}
296299
else if(level==L2)
297300
{
298-
set_l1_indices(ssa, ns);
301+
set_l1_indices(level0, level1, ssa, source.thread_nr, ns);
299302
rename(expr.type(), ssa.get_identifier(), ns, level);
300303
ssa.update_type();
301304

@@ -551,7 +554,7 @@ void goto_symex_statet::rename_address(
551554
ssa_exprt &ssa=to_ssa_expr(expr);
552555

553556
// only do L1!
554-
set_l1_indices(ssa, ns);
557+
set_l1_indices(level0, level1, ssa, source.thread_nr, ns);
555558

556559
rename(expr.type(), ssa.get_identifier(), ns, level);
557560
ssa.update_type();

src/goto-symex/goto_symex_state.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ class goto_symex_statet final
9393
protected:
9494
void rename_address(exprt &expr, const namespacet &ns, levelt level);
9595

96-
void set_l1_indices(ssa_exprt &expr, const namespacet &ns);
9796
void set_l2_indices(ssa_exprt &expr, const namespacet &ns);
9897

9998
// this maps L1 names to (L2) types

0 commit comments

Comments
 (0)