Clang-format instrumentation code

Author: smowton

src/taint-analysis/taint_security_scanner.cpp

@@ -5,24 +5,24 @@
 
 #include "taint_security_scanner.h"
 #include "taint_config.h"
-#include "taint_program.h"
 #include "taint_lvalue_numbering_maps.h"
+#include "taint_program.h"
+#include "taint_rules.h"
+#include "taint_serializer_traits.h"
 #include "taint_statistics.h"
+#include "taint_statistics_dump.h"
 #include "taint_summary.h"
-#include "taint_rules.h"
-#include "taint_tokens_propagation_graph.h"
 #include "taint_summary_dump.h"
-#include "taint_statistics_dump.h"
+#include "taint_tokens_propagation_graph.h"
+#include <chrono> // NOLINT(*) : Google has its own time library.
+#include <iomanip>
+#include <memory>
 #include <taint-instrumenter/instrumentation_driver.h>
 #include <util/config.h>
-#include <util/msgstream.h>
 #include <util/json_map_serializer.h>
+#include <util/msgstream.h>
 #include <util/tmprof.h>
-#include "taint_serializer_traits.h"
-#include <iomanip>
-#include <memory>
-#include <chrono> // NOLINT(*) : Google has its own time library.
-                  //             So they suppress chrono.
+//             So they suppress chrono.
 
 /// \return true if the run was successful, false if there was a problem reading
 ///   one of the input files could not be read
@@ -207,24 +207,21 @@ bool taint_do_security_scan(
       const std::string svg_path =
         (results_dir / "tokens_propagation_graph.svg").native();
 
-      logger.status()
-        << "Saving tokens propagation graph (see '"
-        << svg_path
-        << "')." << messaget::eom;
+      logger.status() << "Saving tokens propagation graph (see '" << svg_path
+                      << "')." << messaget::eom;
       auto ignore = std::system(
         (std::string("dot -Tsvg \"") +
          (results_dir / "tokens_propagation_graph.dot").native() + "\" -o \"" +
          (results_dir / "tokens_propagation_graph.svg").native() + "\"")
-        .c_str());
+          .c_str());
       (void)ignore; // We do not care about the return value, because
       // if the call fails, then the link to the SVG
       // image in the debug HTML output won't work.
       // That is all.
 
       logger.status() << "Saving call graph." << messaget::eom;
       dump_callgraph_in_svg(
-        program.get_call_graph(),
-        (results_dir / "call_graph.svg").native());
+        program.get_call_graph(), (results_dir / "call_graph.svg").native());
       logger.status() << "Saving inverted call graph." << messaget::eom;
       dump_callgraph_in_svg(
         program.get_inverted_call_graph(),
@@ -234,7 +231,8 @@ bool taint_do_security_scan(
   else
   {
     logger.error() << "Instrumentation was skipped due to timeout. Continuing "
-      "to dump output if requested" << messaget::eom;
+                      "to dump output if requested"
+                   << messaget::eom;
   }
 
   if(config.is_html_dump_of_summaries_enabled())

src/taint-instrumenter/instrumentation_driver.cpp

@@ -4,17 +4,17 @@
 /// The module implements instrumentation of the passed GOTO program according
 ///   to propagation of tainted data through it.
 
+#include <algorithm>
+#include <fstream>
+#include <summaries/summary_dump.h>
 #include <taint-instrumenter/instrumentation_driver.h>
-#include <taint-instrumenter/search_for_rule_applications.h>
 #include <taint-instrumenter/instrumentation_props.h>
-#include <taint-instrumenter/instrumenter.h>
 #include <taint-instrumenter/instrumented_goto_binary_builder.h>
-#include <util/msgstream.h>
+#include <taint-instrumenter/instrumenter.h>
+#include <taint-instrumenter/search_for_rule_applications.h>
 #include <util/file_util.h>
+#include <util/msgstream.h>
 #include <util/tmprof.h>
-#include <summaries/summary_dump.h>
-#include <algorithm>
-#include <fstream>
 
 taint_instrumentation_drivert::taint_instrumentation_drivert(
   const taint_programt &program,
@@ -49,12 +49,11 @@ void taint_instrumentation_drivert::run(
 
   statistics.begin_search_for_rule_applications();
 
-  logger.status()
-    << "Starting instrumenter on the analysed program." << messaget::eom;
+  logger.status() << "Starting instrumenter on the analysed program."
+                  << messaget::eom;
 
   logger.status() << "  Searching for rule applications." << messaget::eom;
-  rule_application_sitest
-    map_from_functions_to_rule_application_sites;
+  rule_application_sitest map_from_functions_to_rule_application_sites;
   taint_search_for_rule_applications(
     summaries, map_from_functions_to_rule_application_sites, program);
 
@@ -72,8 +71,8 @@ void taint_instrumentation_drivert::run(
   statistics.end_search_for_rule_applications();
   statistics.begin_instrumentation_props();
 
-  logger.status()
-    << "  Collecting the instrumentation properties." << messaget::eom;
+  logger.status() << "  Collecting the instrumentation properties."
+                  << messaget::eom;
 
   taint_instrumentation_propst instrumentation_props(
     map_from_functions_to_rule_application_sites,
@@ -83,8 +82,8 @@ void taint_instrumentation_drivert::run(
 
   // Dump computed instrumentation props into JSON files.
   {
-    logger.status()
-      << "  Saving instrumentation properties as JSON." << messaget::eom;
+    logger.status() << "  Saving instrumentation properties as JSON."
+                    << messaget::eom;
     json_objectt jobj;
     dump_as_json(instrumentation_props, jobj);
     std::ofstream ostr((results_dir / "instrumentation_props.json").native());
@@ -109,11 +108,10 @@ void taint_instrumentation_drivert::run(
   statistics.end_instrumenter();
   statistics.begin_instrumented_goto_binary_build();
 
-  logger.status()
-    << "  Starting the builder of the instrumented GOTO binary."
-    << messaget::eom;
+  logger.status() << "  Starting the builder of the instrumented GOTO binary."
+                  << messaget::eom;
 
-  const std::pair<taint_instrumented_goto_binary_infot,std::string>
+  const std::pair<taint_instrumented_goto_binary_infot, std::string>
     task_valid = build_instrumented_goto_binary(
       instrumentation_props,
       instrumenter,
@@ -126,13 +124,12 @@ void taint_instrumentation_drivert::run(
       string_refinement_enabled);
   if(task_valid.second.empty())
   {
-    logger.status()
-      << "  Saving info JSON file about the saved GOTO binary."
-      << messaget::eom;
+    logger.status() << "  Saving info JSON file about the saved GOTO binary."
+                    << messaget::eom;
 
     json_objectt jtask;
     dump_as_json(task_valid.first, jtask);
-    std::ofstream  ostr(
+    std::ofstream ostr(
       (results_dir / "instrumented_goto_program.json").native());
     ostr << jtask;
   }

src/taint-instrumenter/instrumentation_driver.h

@@ -10,8 +10,8 @@
 #define CPROVER_TAINT_INSTRUMENTER_INSTRUMENTATION_DRIVER_H
 
 #include <taint-analysis/taint_program.h>
-#include <taint-analysis/taint_tokens_propagation_graph.h>
 #include <taint-analysis/taint_summary.h>
+#include <taint-analysis/taint_tokens_propagation_graph.h>
 #include <util/message.h>
 
 #include <boost/filesystem.hpp>