Use global null_message_handlert instead of duplicates.

Author: thomasspriggs

jbmc/src/java_bytecode/java_object_factory.cpp

@@ -1055,10 +1055,9 @@ void java_object_factoryt::gen_nondet_struct_init(
     // passes can easily recognise leaves no uninitialised state behind.
 
     // This code mirrors the `remove_java_new` pass:
-    null_message_handlert nullout;
     exprt zero_object=
       zero_initializer(
-        struct_type, source_locationt(), ns, nullout);
+        struct_type, source_locationt(), ns, null_message_handler);
     irep_idt qualified_clsid = "java::" + id2string(class_identifier);
     set_class_identifier(
       to_struct_expr(zero_object), ns, symbol_typet(qualified_clsid));

jbmc/unit/java-testing-utils/load_java_class.cpp

@@ -94,13 +94,12 @@ symbol_tablet load_java_class(
   std::string filename=java_class_name + ".class";
 
   // Construct a lazy_goto_modelt
-  null_message_handlert message_handler;
   lazy_goto_modelt lazy_goto_model(
     [] (goto_model_functiont &function, const abstract_goto_modelt &model) { }, // NOLINT (*)
     [] (goto_modelt &goto_model) { return false; }, // NOLINT (*)
     [] (const irep_idt &name) { return false; },
     [] (const irep_idt &function_name, symbol_table_baset &symbol_table, goto_functiont &function, bool body_available) { return false; }, // NOLINT (*)
-    message_handler);
+    null_message_handler);
 
   // Configure the path loading
   config.java.classpath.clear();
@@ -115,7 +114,7 @@ symbol_tablet load_java_class(
   std::istringstream java_code_stream("ignored");
 
   // Configure the language, load the class files
-  language.set_message_handler(message_handler);
+  language.set_message_handler(null_message_handler);
   language.get_language_options(command_line);
   language.parse(java_code_stream, filename);
   language.typecheck(lazy_goto_model.symbol_table, "");

jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/java_bytecode_parse_lambda_method_table.cpp

@@ -29,7 +29,6 @@ SCENARIO(
 {
   // NOLINTNEXTLINE(whitespace/braces)
   run_test_with_compilers([](const std::string &compiler) {
-    null_message_handlert message_handler;
     GIVEN(
       "A class with a static lambda variables from " + compiler + " compiler.")
     {
@@ -38,7 +37,7 @@ SCENARIO(
         "./java_bytecode/java_bytecode_parse_lambdas/lambda_examples/" +
           compiler + "_classes/StaticLambdas.class",
         parse_tree,
-        message_handler);
+        null_message_handler);
       WHEN("Parsing that class")
       {
         REQUIRE(parse_tree.loading_successful);
@@ -342,15 +341,14 @@ SCENARIO(
 {
   run_test_with_compilers(
     [](const std::string &compiler) { // NOLINT(whitespace/braces)
-      null_message_handlert message_handler;
       GIVEN("A method with local lambdas from " + compiler + " compiler.")
       {
         java_bytecode_parse_treet parse_tree;
         java_bytecode_parse(
           "./java_bytecode/java_bytecode_parse_lambdas/lambda_examples/" +
             compiler + "_classes/LocalLambdas.class",
           parse_tree,
-          message_handler);
+          null_message_handler);
         WHEN("Parsing that class")
         {
           REQUIRE(parse_tree.loading_successful);
@@ -650,7 +648,6 @@ SCENARIO(
 {
   run_test_with_compilers(
     [](const std::string &compiler) { // NOLINT(whitespace/braces)
-      null_message_handlert message_handler;
       GIVEN(
         "A class that has lambdas as member variables from " + compiler +
         " compiler.")
@@ -660,7 +657,7 @@ SCENARIO(
           "./java_bytecode/java_bytecode_parse_lambdas/lambda_examples/" +
             compiler + "_classes/MemberLambdas.class",
           parse_tree,
-          message_handler);
+          null_message_handler);
         WHEN("Parsing that class")
         {
           REQUIRE(parse_tree.loading_successful);
@@ -985,7 +982,6 @@ SCENARIO(
 {
   run_test_with_compilers(
     [](const std::string &compiler) { // NOLINT(whitespace/braces)
-      null_message_handlert message_handler;
       GIVEN(
         "An inner class with member variables as lambdas that capture outer "
         "variables from " +
@@ -996,7 +992,7 @@ SCENARIO(
           "./java_bytecode/java_bytecode_parse_lambdas/lambda_examples/" +
             compiler + "_classes/OuterMemberLambdas$Inner.class",
           parse_tree,
-          message_handler);
+          null_message_handler);
         WHEN("Parsing that class")
         {
           REQUIRE(parse_tree.loading_successful);

jbmc/unit/java_bytecode/java_replace_nondet/replace_nondet.cpp

@@ -84,9 +84,8 @@ TEST_CASE(
     journalling_symbol_tablet symbol_table =
       journalling_symbol_tablet::wrap(raw_symbol_table);
 
-    null_message_handlert null_output;
     goto_functionst functions;
-    goto_convert(symbol_table, functions, null_output);
+    goto_convert(symbol_table, functions, null_message_handler);
 
     const std::string function_name = "java::Main.replaceNondet:()V";
     goto_functionst::goto_functiont &goto_function =

jbmc/unit/java_bytecode/java_virtual_functions/virtual_functions.cpp

@@ -53,9 +53,8 @@ SCENARIO(
     WHEN("The entry point function is generated")
     {
       symbol_tablet new_table(symbol_table);
-      null_message_handlert null_output;
       goto_functionst new_goto_functions;
-      goto_convert(new_table, new_goto_functions, null_output);
+      goto_convert(new_table, new_goto_functions, null_message_handler);
       remove_virtual_functions(new_table, new_goto_functions);
 
       bool found_function = false;
@@ -129,7 +128,7 @@ SCENARIO(
         options.set_option("cover", "location");
         REQUIRE_FALSE(
           instrument_cover_goals(
-            options, new_table, new_goto_functions, null_output));
+            options, new_table, new_goto_functions, null_message_handler));
 
         auto function = new_goto_functions.function_map.find(function_name);
         REQUIRE(function != new_goto_functions.function_map.end());

jbmc/unit/pointer-analysis/custom_value_set_analysis.cpp

@@ -170,7 +170,6 @@ SCENARIO("test_value_set_analysis",
   {
     config.set_arch("none");
     config.main = "";
-    null_message_handlert null_output;
     cmdlinet command_line;
 
     // This classpath is the default, but the config object
@@ -182,7 +181,7 @@ SCENARIO("test_value_set_analysis",
     register_language(new_java_bytecode_language);
 
     goto_modelt goto_model=
-      initialize_goto_model(command_line, null_output);
+      initialize_goto_model(command_line, null_message_handler);
 
     null_message_handlert message_handler;
     remove_java_new(goto_model, message_handler);
@@ -191,7 +190,7 @@ SCENARIO("test_value_set_analysis",
 
     // Fully inline the test program, to avoid VSA conflating
     // constructor callsites confusing the results we're trying to check:
-    goto_function_inline(goto_model, TEST_FUNCTION_NAME, null_output);
+    goto_function_inline(goto_model, TEST_FUNCTION_NAME, null_message_handler);
 
     const goto_programt &test_function=
       goto_model.goto_functions.function_map.at(TEST_PREFIX "test:()V").body;

src/cbmc/xml_interface.cpp

@@ -22,10 +22,9 @@ void xml_interfacet::get_xml_options(cmdlinet &cmdline)
 {
   if(cmdline.isset("xml-interface"))
   {
-    null_message_handlert message_handler;
     xmlt xml;
 
-    parse_xml(std::cin, "", message_handler, xml);
+    parse_xml(std::cin, "", null_message_handler, xml);
 
     get_xml_options(xml, cmdline);
 

src/goto-instrument/wmm/goto2graph.cpp

@@ -1303,10 +1303,9 @@ bool instrumentert::is_cfg_spurious(const event_grapht::critical_cyclet &cyc)
   goto_functionst this_interleaving;
   this_interleaving.function_map=std::move(map);
   optionst no_option;
-  null_message_handlert no_message;
 
   #if 0
-  bmct bmc(no_option, symbol_table, no_message);
+  bmct bmc(no_option, symbol_table, null_message_handler);
 
   bool is_spurious=bmc.run(this_interleaving);
 

src/goto-symex/symex_builtin_functions.cpp

@@ -168,13 +168,12 @@ void goto_symext::symex_allocate(
 
   if(!zero_init.is_zero() && !zero_init.is_false())
   {
-    null_message_handlert null_message;
     exprt zero_value=
       zero_initializer(
         object_type,
         code.source_location(),
         ns,
-        null_message);
+        null_message_handler);
 
     if(zero_value.is_not_nil())
     {

src/langapi/language_util.cpp

@@ -75,7 +75,6 @@ exprt to_expr(
 {
   std::unique_ptr<languaget> p(get_language_from_identifier(ns, identifier));
 
-  null_message_handlert null_message_handler;
   p->set_message_handler(null_message_handler);
 
   const symbolt &symbol=ns.lookup(identifier);

src/xmllang/graphml.cpp

@@ -186,10 +186,9 @@ bool read_graphml(
   graphmlt &dest,
   graphmlt::node_indext &entry)
 {
-  null_message_handlert message_handler;
   xmlt xml;
 
-  if(parse_xml(is, "", message_handler, xml))
+  if(parse_xml(is, "", null_message_handler, xml))
     return true;
 
   return build_graph(xml, dest, entry);
@@ -200,10 +199,9 @@ bool read_graphml(
   graphmlt &dest,
   graphmlt::node_indext &entry)
 {
-  null_message_handlert message_handler;
   xmlt xml;
 
-  if(parse_xml(filename, message_handler, xml))
+  if(parse_xml(filename, null_message_handler, xml))
     return true;
 
   return build_graph(xml, dest, entry);

unit/json/json_parser.cpp

@@ -11,7 +11,6 @@
 
 SCENARIO("Loading JSON files")
 {
-  null_message_handlert message_handler;
   GIVEN("A invalid JSON file and a valid JSON file")
   {
     const std::string valid_json_path = "./json/valid.json";
@@ -21,7 +20,7 @@ SCENARIO("Loading JSON files")
     {
       jsont invalid_json;
       const auto invalid_parse_error =
-        parse_json(invalid_json_path, message_handler, invalid_json);
+        parse_json(invalid_json_path, null_message_handler, invalid_json);
       THEN("An error state should be returned")
       {
         REQUIRE(invalid_parse_error);
@@ -30,7 +29,7 @@ SCENARIO("Loading JSON files")
         {
           jsont valid_json;
           const auto valid_parse_error =
-            parse_json(valid_json_path, message_handler, valid_json);
+            parse_json(valid_json_path, null_message_handler, valid_json);
           THEN("The JSON file should be parsed correctly")
           {
             REQUIRE_FALSE(valid_parse_error);
@@ -45,7 +44,7 @@ SCENARIO("Loading JSON files")
     {
       jsont valid_json;
       const auto valid_parse_error =
-        parse_json(valid_json_path, message_handler, valid_json);
+        parse_json(valid_json_path, null_message_handler, valid_json);
       THEN("The JSON file should be parsed correctly")
       {
         REQUIRE_FALSE(valid_parse_error);
@@ -56,7 +55,7 @@ SCENARIO("Loading JSON files")
         {
           jsont invalid_json;
           const auto invalid_parse_error =
-            parse_json(invalid_json_path, message_handler, invalid_json);
+            parse_json(invalid_json_path, null_message_handler, invalid_json);
           THEN("An error state should be returned")
           {
             REQUIRE(invalid_parse_error);