Merge pull request diffblue#360 from diffblue/SEC-304_Slow_Summary_Printing

SEC-304: Slow VSA summary printing

Author: JohnDumbell

src/driver/sec_driver_parse_options.cpp

@@ -65,6 +65,7 @@
 #include "sec_driver_parse_options.h"
 
 #include <fstream>
+#include <java_bytecode/java_utils.h>
 
 sec_driver_parse_optionst::sec_driver_parse_optionst(int argc, const char **argv):
   parse_options_baset(SEC_DRIVER_OPTIONS, argc, argv),
@@ -227,6 +228,26 @@ int sec_driver_parse_optionst::doit()
         value_set_analysis.save_summary(gf.body);
     }
     else {
+      const std::string function_name = cmdline.get_value("function");
+      const bool print_function_summary = cmdline.isset("show-value-sets");
+      const bool print_all_summaries = cmdline.isset("show-value-sets-all");
+
+      std::string error_string;
+      const irep_idt fully_qualified_name = resolve_friendly_method_name(
+        function_name, goto_model.symbol_table, error_string);
+      if(print_function_summary)
+      {
+        if(function_name.empty())
+        {
+          warning() << "Show value set analysis enabled but no function name passed in. "
+                        "Please add a function name or use show-value-sets-all.\n";
+        }
+        else if(!error_string.empty())
+        {
+          error() << "Error when resolving function to symbol: " << error_string << "\n";
+        }
+      }
+
       call_grapht const call_graph(goto_model.goto_functions);
       std::vector<irep_idt> process_order =
         get_inverse_topological_order(call_graph.get_directed_graph());
@@ -250,7 +271,8 @@ int sec_driver_parse_optionst::doit()
           summarydb);
         value_set_analysis.set_message_handler(get_message_handler());
         value_set_analysis(gf.body);
-        if(cmdline.isset("show-value-sets"))
+
+        if((print_function_summary && fname == fully_qualified_name) || print_all_summaries)
         {
           switch(get_ui())
           {
@@ -275,7 +297,7 @@ int sec_driver_parse_optionst::doit()
           value_set_analysis.save_summary(gf.body);
       }
 
-      if(cmdline.isset("show-value-sets") &&
+      if((print_function_summary || print_all_summaries) &&
          get_ui()==ui_message_handlert::uit::JSON_UI)
       {
         json_objectt dump_message;

src/driver/sec_driver_parse_options.h

@@ -38,7 +38,7 @@ class optionst;
   "(intervals)(show-intervals)" \
   "(non-null)(show-non-null)" \
   "(lvsa-summary-directory):" \
-  "(local-value-set-analysis)(show-value-sets)(lvsa-function):" \
+  "(local-value-set-analysis)(show-value-sets-all)(show-value-sets)(lvsa-function):" \
   "(security-scanner):" \
   "(do-not-use-precise-access-paths)" \
   "(rebuild-taint-cache)" \