Skip to content

Commit 8aa31fe

Browse files
author
Daniel Kroening
authored
Merge pull request #3430 from johnnonweiler/doc/reduce-doxygen-warnings-18
Fix Doxygen warnings in goto-instrument/wmm folder
2 parents 10edd29 + 3a18c51 commit 8aa31fe

File tree

5 files changed

+8
-25
lines changed

5 files changed

+8
-25
lines changed

scripts/expected_doxygen_warnings.txt

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,3 @@
1919
/cbmc/doc/architectural/howto.md:260: warning: found </div> at different nesting level (6) than expected (3)
2020
/cbmc/doc/architectural/howto.md:261: warning: end of comment block while expecting command </div>
2121
/cbmc/src/solvers/README.md:434: warning: Invalid list item found
22-
/cbmc/src/goto-instrument/wmm/event_graph.h:506: warning: The following parameters of event_grapht::explore_copy_segment(std::set< event_idt > &explored, event_idt begin, event_idt end) const are not documented:
23-
parameter 'explored'
24-
/cbmc/src/goto-instrument/wmm/cycle_collection.cpp:149: warning: argument 'get_po_only' of command @param is not found in the argument list of event_grapht::graph_explorert::backtrack(std::set< critical_cyclet > &set_of_cycles, event_idt source, event_idt vertex, bool unsafe_met, event_idt po_trans, bool same_var_pair, bool lwfence_met, bool has_to_be_unsafe, irep_idt var_to_avoid, memory_modelt model)
25-
/cbmc/src/goto-instrument/wmm/event_graph.h:315: warning: The following parameters of event_grapht::graph_explorert::backtrack(std::set< critical_cyclet > &set_of_cycles, event_idt source, event_idt vertex, bool unsafe_met, event_idt po_trans, bool same_var_pair, bool lwfence_met, bool has_to_be_unsafe, irep_idt var_to_avoid, memory_modelt model) are not documented:
26-
parameter 'set_of_cycles'
27-
parameter 'source'
28-
parameter 'vertex'
29-
parameter 'unsafe_met'
30-
parameter 'po_trans'
31-
parameter 'same_var_pair'
32-
parameter 'lwfence_met'
33-
parameter 'has_to_be_unsafe'
34-
parameter 'var_to_avoid'
35-
parameter 'model'
36-
/cbmc/src/goto-instrument/wmm/goto2graph.h:260: warning: The following parameters of instrumentert::cfg_visitort::visit_cfg_function(value_setst &value_sets, memory_modelt model, bool no_dependencies, loop_strategyt duplicate_body, const irep_idt &function, std::set< nodet > &ending_vertex) are not documented:
37-
parameter 'model'
38-
parameter 'no_dependencies'
39-
parameter 'duplicate_body'

src/goto-instrument/wmm/cycle_collection.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ event_grapht::critical_cyclet event_grapht::graph_explorert::extract_cycle(
147147
}
148148

149149
/// see event_grapht::collect_cycles
150-
/// \param get_po_only: used for po-transitivity
151150
bool event_grapht::graph_explorert::backtrack(
152151
std::set<critical_cyclet> &set_of_cycles,
153152
event_idt source,

src/goto-instrument/wmm/event_graph.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ void event_grapht::print_graph()
6868

6969
/// copies the segment
7070
/// \param begin: top of the subgraph
71+
/// \param explored: set of segments which have already been explored
7172
/// \param end: bottom of the subgraph
7273
void event_grapht::explore_copy_segment(std::set<event_idt> &explored,
7374
event_idt begin, event_idt end) const

src/goto-instrument/wmm/goto2graph.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,14 +145,11 @@ unsigned instrumentert::goto2graph_cfg(
145145
}
146146

147147
void instrumentert::cfg_visitort::visit_cfg_function(
148-
/* value_sets and options */
149148
value_setst &value_sets,
150149
memory_modelt model,
151150
bool no_dependencies,
152151
loop_strategyt replicate_body,
153-
/* function to analyse */
154152
const irep_idt &function,
155-
/* outcoming edges */
156153
std::set<instrumentert::cfg_visitort::nodet> &ending_vertex)
157154
{
158155
/* flow: egraph */

src/goto-instrument/wmm/goto2graph.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,15 +257,19 @@ class instrumentert
257257
}
258258

259259
/// TODO: move the visitor outside, and inherit
260+
/// \param value_sets: Value_sets and options
261+
/// \param model: Memory model
262+
/// \param no_dependencies: Option to disable dependency analysis
263+
/// \param duplicate_body: Control which loop body segments should
264+
/// be duplicated
265+
/// \param function: Function to analyse
266+
/// \param ending_vertex: Outcoming edges
260267
virtual void visit_cfg_function(
261-
/// value_sets and options
262268
value_setst &value_sets,
263269
memory_modelt model,
264270
bool no_dependencies,
265271
loop_strategyt duplicate_body,
266-
/// function to analyse
267272
const irep_idt &function,
268-
/// outcoming edges
269273
std::set<nodet> &ending_vertex);
270274

271275
bool inline local(const irep_idt &i);

0 commit comments

Comments
 (0)