Skip to content

Commit e485eba

Browse files
committed
Do not pass in class member "ns"
This avoids shadowing.
1 parent c091992 commit e485eba

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

src/goto-instrument/wmm/goto2graph.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,13 @@ void instrumentert::cfg_visitort::visit_cfg_function(
210210
/* a:=b -o-> Rb -po-> Wa */
211211
else if(instruction.is_assign())
212212
{
213-
visit_cfg_assign(value_sets, ns, i_it, no_dependencies
213+
visit_cfg_assign(
214+
value_sets,
215+
i_it,
216+
no_dependencies
214217
#ifdef LOCAL_MAY
215-
, local_may
218+
,
219+
local_may
216220
#endif
217221
); // NOLINT(whitespace/parens)
218222
}
@@ -783,7 +787,6 @@ void instrumentert::cfg_visitort::visit_cfg_asm_fence(
783787

784788
void instrumentert::cfg_visitort::visit_cfg_assign(
785789
value_setst &value_sets,
786-
namespacet &ns,
787790
goto_programt::instructionst::iterator &i_it,
788791
bool no_dependencies
789792
#ifdef LOCAL_MAY

src/goto-instrument/wmm/goto2graph.h

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,14 @@ class instrumentert
125125
goto_programt::const_targett i_it);
126126
void inline visit_cfg_duplicate(goto_programt::const_targett targ,
127127
goto_programt::const_targett i_it);
128-
void visit_cfg_assign(value_setst &value_sets, namespacet &ns,
129-
goto_programt::instructionst::iterator &i_it, bool no_dependencies
130-
#ifdef LOCAL_MAY
131-
, local_may_aliast &local_may
132-
#endif
128+
void visit_cfg_assign(
129+
value_setst &value_sets,
130+
goto_programt::instructionst::iterator &i_it,
131+
bool no_dependencies
132+
#ifdef LOCAL_MAY
133+
,
134+
local_may_aliast &local_may
135+
#endif
133136
); // NOLINT(whitespace/parens)
134137
void visit_cfg_fence(goto_programt::instructionst::iterator i_it);
135138
void visit_cfg_skip(goto_programt::instructionst::iterator i_it);

0 commit comments

Comments
 (0)