Cleanup: split taint_instrumentert constructor

The constructor now simply sets fields, and run() does the real work.

Author: smowton

src/taint-slicer/instrumenter.cpp

@@ -74,19 +74,26 @@ static irept add_shadow_variables_to_type(
 }
 
 taint_instrumentert::taint_instrumentert(
-  const taint_instrumentation_propst &props,
+  const taint_instrumentation_propst &in_props,
   const taint_programt *const in_program,
   taint_statisticst *const in_statistics,
   const bool use_data_flow_insensitive_instrumentation)
-  : program(in_program)
+  : props(in_props)
+  , program(in_program)
   , statistics(in_statistics)
   , use_data_flow_insensitive_version(use_data_flow_insensitive_instrumentation)
 {
-  // The next line must be here in order to prevent clang produce the error:
-  //    `error: private field 'use_data_flow_insensitive_version' is not used
-  //     [-Werror,-Wunused-private-field]`
-  (void)use_data_flow_insensitive_version;
+}
 
+/// Builds a new symbol table from the original symbol
+/// table in in_program->get_symbol_table(), by removing of symbols not related
+/// to the set of functions defined in the passed instrumentation properties.
+/// The function also build a new set of functions from those defined in
+/// in_program->get_functions() and which appear in props.get_location_props().
+/// These functions are instrumented by a new code accodring to recipes in
+/// individual elements of props.get_location_props().
+void taint_instrumentert::run()
+{
   assert(program!=nullptr);
   assert(statistics!=nullptr);
 

src/taint-slicer/instrumenter.h

@@ -40,13 +40,7 @@ class taint_instrumentert
 
    Outputs:
 
-   Purpose: The function builds a new symbol table from the original symbol
-   table in in_program->get_symbol_table(), by removing of symbols not related
-   to the set of functions defined in the passed instrumentation properties.
-   The function also build a new set of functions from those defined in
-   in_program->get_functions() and which appear in props.get_location_props().
-   These functions are instrumented by a new code accodring to recipes in
-   individual elements of props.get_location_props().
+   Purpose:
 
   \*******************************************************************/
   taint_instrumentert(
@@ -55,6 +49,8 @@ class taint_instrumentert
     taint_statisticst * const in_statistics,
     const bool use_data_flow_insensitive_instrumentation);
 
+  void run();
+
   const goto_functionst &get_instrumented_functions() const
   { return instrumented_functions; }
 
@@ -89,6 +85,7 @@ class taint_instrumentert
     const std::size_t instruction_index,
     const taint_instrumentation_propst &props);
 
+  const taint_instrumentation_propst &props;
   const taint_programt *program;
   taint_statisticst *statistics;
   goto_functionst instrumented_functions;

src/taint-slicer/slicer.cpp

@@ -97,11 +97,14 @@ void taint_slicert::compute_slice(
   std::vector<taint_slicing_taskt> sliced_goto_programs;
   for(std::size_t i=0UL, n=instrumentation_props.size(); i!=n; ++i)
   {
-    const taint_instrumentert instrumenter(
+    taint_instrumentert instrumenter(
       instrumentation_props.at(i),
       program,
       statistics,
       use_data_flow_insensitive_instrumentation);
+
+    instrumenter.run();
+
     const std::pair<taint_slicing_taskt,std::string> task_valid=
       build_slicing_task(
         instrumentation_props.at(i),