Avoid evaluation-order warnings with Visual Studio

Constructing the arguments in place triggers a warning with Visual Studio. Just
construct them in a fixed order upfront and move each of them.

Author: tautschnig

src/analyses/ai.cpp

@@ -95,11 +95,15 @@ jsont ai_baset::output_json(
     std::ostringstream out;
     goto_program.output_instruction(ns, function_id, out, *i_it);
 
+    json_numbert location_number_json(std::to_string(i_it->location_number));
+    json_stringt source_location_json(i_it->source_location.as_string());
+    jsont abstract_state_json(abstract_state_before(i_it)->output_json(*this, ns));
+    json_stringt instruction_json(out.str());
     json_objectt location(
-      {{"locationNumber", json_numbert(std::to_string(i_it->location_number))},
-       {"sourceLocation", json_stringt(i_it->source_location.as_string())},
-       {"abstractState", abstract_state_before(i_it)->output_json(*this, ns)},
-       {"instruction", json_stringt(out.str())}});
+      {{"locationNumber", std::move(location_number_json)},
+       {"sourceLocation", std::move(source_location_json)},
+       {"abstractState", std::move(abstract_state_json)},
+       {"instruction", std::move(instruction_json)}});
 
     contents.push_back(std::move(location));
   }

src/goto-analyzer/unreachable_instructions.cpp

@@ -118,8 +118,13 @@ static void add_to_json(
     {{"function", json_stringt(function_identifier)},
      {"fileName",
       json_stringt(concat_dir_file(
+  // json_stringt function_json(end_function->function);
+  // json_stringt file_name_json(concat_dir_file(
         id2string(end_function->source_location.get_working_directory()),
-        id2string(end_function->source_location.get_file())))}});
+        id2string(end_function->source_location.get_file())));
+  //json_objectt entry(
+   // {{"function", std::move(function_json)},
+     //{"fileName", std::move(file_name_json)}});
 
   json_arrayt &dead_ins=entry["unreachableInstructions"].make_array();
 
@@ -142,8 +147,10 @@ static void add_to_json(
 
     // print info for file actually with full path
     const source_locationt &l=it->second->source_location;
+    jsont source_location_json(json(l));
+    json_stringt statement_json(s);
     json_objectt i_entry(
-      {{"sourceLocation", json(l)}, {"statement", json_stringt(s)}});
+      {{"sourceLocation", std::move(source_location_json)}, {"statement", std::move(statement_json)}});
     dead_ins.push_back(std::move(i_entry));
   }
 
@@ -246,12 +253,13 @@ static void json_output_function(
   const source_locationt &last_location,
   json_arrayt &dest)
 {
-  json_objectt entry(
-    {{"function", json_stringt(function)},
-     {"file name",
-      json_stringt(concat_dir_file(
+  json_stringt function_json(function);
+  json_stringt file_name_json(concat_dir_file(
         id2string(first_location.get_working_directory()),
-        id2string(first_location.get_file())))},
+        id2string(first_location.get_file())));
+  json_objectt entry(
+    {{"function", std::move(function_json)},
+     {"file name", std::move(file_name_json)},
      {"first line", json_numbert(id2string(first_location.get_line()))},
      {"last line", json_numbert(id2string(last_location.get_line()))}});
 

src/goto-checker/properties.cpp

@@ -56,9 +56,9 @@ std::string as_string(property_statust status)
 
 property_infot::property_infot(
   goto_programt::const_targett pc,
-  std::string description,
+  const std::string &description,
   property_statust status)
-  : pc(pc), description(std::move(description)), status(status)
+  : pc(pc), description(description), status(status)
 {
 }
 
@@ -80,9 +80,8 @@ propertiest initialize_properties(const abstract_goto_modelt &goto_model)
       std::string description = id2string(i_it->source_location.get_comment());
       if(description.empty())
         description = "assertion";
-      properties.emplace(
-        i_it->source_location.get_property_id(),
-        property_infot{i_it, description, property_statust::NOT_CHECKED});
+      property_infot info{i_it, description, property_statust::NOT_CHECKED};
+      properties.emplace(i_it->source_location.get_property_id(), std::move(info));
     }
   }
   return properties;

src/goto-checker/properties.h

@@ -57,7 +57,7 @@ struct property_infot
 {
   property_infot(
     goto_programt::const_targett pc,
-    std::string description,
+    const std::string &description,
     property_statust status);
 
   /// A pointer to the corresponding goto instruction

src/goto-diff/goto_diff_base.cpp

@@ -38,9 +38,9 @@ void goto_difft::output_functions() const
     }
     case ui_message_handlert::uit::JSON_UI:
     {
+      json_stringt total_number_of_functions_json(std::to_string(total_functions_count));
       json_objectt json_result(
-        {{"totalNumberOfFunctions",
-          json_stringt(std::to_string(total_functions_count))}});
+        {{"totalNumberOfFunctions", std::move(total_number_of_functions_json)}});
       convert_function_group_json(
         json_result["newFunctions"].make_array(), new_functions, goto_model2);
       convert_function_group_json(

src/goto-programs/loop_ids.cpp

@@ -81,9 +81,11 @@ void show_loop_ids_json(
     {
       std::string id = id2string(goto_programt::loop_id(function_id, *it));
 
+      json_stringt name_json(id);
+      jsont source_location_json(json(it->source_location));
       loops.push_back(
-        json_objectt({{"name", json_stringt(id)},
-                      {"sourceLocation", json(it->source_location)}}));
+        json_objectt({{"name", std::move(name_json)},
+                      {"sourceLocation", std::move(source_location_json)}}));
     }
   }
 }

src/goto-programs/show_goto_functions_json.cpp

@@ -70,8 +70,9 @@ json_objectt show_goto_functions_jsont::convert(
       for(const goto_programt::instructiont &instruction :
         function.body.instructions)
       {
+        json_stringt instruction_id(instruction.to_string());
         json_objectt instruction_entry(
-          {{"instructionId", json_stringt(instruction.to_string())}});
+          {{"instructionId", std::move(instruction_id)}});
 
         if(instruction.code.source_location().is_not_nil())
         {

src/goto-programs/show_properties.cpp

@@ -129,12 +129,17 @@ void convert_properties_json(
 
     irep_idt property_id=source_location.get_property_id();
 
+    json_stringt name_json(property_id);
+    json_stringt class_json(property_class);
+    jsont source_location_json(json(source_location));
+    json_stringt description_json(description);
+    json_stringt expression_json(from_expr(ns, identifier, ins.guard));
     json_objectt json_property(
-      {{"name", json_stringt(property_id)},
-       {"class", json_stringt(property_class)},
-       {"sourceLocation", json(source_location)},
-       {"description", json_stringt(description)},
-       {"expression", json_stringt(from_expr(ns, identifier, ins.guard))}});
+      {{"name", std::move(name_json)},
+       {"class", std::move(class_json)},
+       {"sourceLocation", std::move(source_location_json)},
+       {"description", std::move(description_json)},
+       {"expression", std::move(expression_json)}});
 
     if(!source_location.get_basic_block_covered_lines().empty())
       json_property["coveredLines"] =

src/goto-programs/show_symbol_table.cpp

@@ -194,36 +194,59 @@ static void show_symbol_table_json_ui(
     if(symbol.value.is_not_nil())
       ptr->from_expr(symbol.value, value_str, ns);
 
+    json_stringt pretty_name_json(symbol.pretty_name);
+    json_stringt name_json(symbol.name);
+    json_stringt base_name_json(symbol.base_name);
+    json_stringt mode_json(symbol.mode);
+    json_stringt module_json(symbol.module);
+    json_stringt pretty_type_json(type_str);
+    json_stringt pretty_value_json(value_str);
+    jsont type_json(irep_converter.convert_from_irep(symbol.type));
+    jsont value_json(irep_converter.convert_from_irep(symbol.value));
+    jsont location_json(irep_converter.convert_from_irep(symbol.location));
+    jsont is_type_json(jsont::json_boolean(symbol.is_type));
+    jsont is_macro_json(jsont::json_boolean(symbol.is_macro));
+    jsont is_exported_json(jsont::json_boolean(symbol.is_exported));
+    jsont is_input_json(jsont::json_boolean(symbol.is_input));
+    jsont is_output_json(jsont::json_boolean(symbol.is_output));
+    jsont is_state_var_json(jsont::json_boolean(symbol.is_state_var));
+    jsont is_property_json(jsont::json_boolean(symbol.is_property));
+    jsont is_static_lifetime_json(jsont::json_boolean(symbol.is_static_lifetime));
+    jsont is_thread_local_json(jsont::json_boolean(symbol.is_thread_local));
+    jsont is_lvalue_json(jsont::json_boolean(symbol.is_lvalue));
+    jsont is_file_local_json(jsont::json_boolean(symbol.is_file_local));
+    jsont is_extern_json(jsont::json_boolean(symbol.is_extern));
+    jsont is_volatile_json(jsont::json_boolean(symbol.is_volatile));
+    jsont is_parameter_json(jsont::json_boolean(symbol.is_parameter));
+    jsont is_auxiliary_json(jsont::json_boolean(symbol.is_auxiliary));
+    jsont is_weak_json(jsont::json_boolean(symbol.is_weak));
     json_objectt symbol_json(
-      {{"prettyName", json_stringt(symbol.pretty_name)},
-       {"name", json_stringt(symbol.name)},
-       {"baseName", json_stringt(symbol.base_name)},
-       {"mode", json_stringt(symbol.mode)},
-       {"module", json_stringt(symbol.module)},
-
-       {"prettyType", json_stringt(type_str)},
-       {"prettyValue", json_stringt(value_str)},
-
-       {"type", irep_converter.convert_from_irep(symbol.type)},
-       {"value", irep_converter.convert_from_irep(symbol.value)},
-       {"location", irep_converter.convert_from_irep(symbol.location)},
-
-       {"isType", jsont::json_boolean(symbol.is_type)},
-       {"isMacro", jsont::json_boolean(symbol.is_macro)},
-       {"isExported", jsont::json_boolean(symbol.is_exported)},
-       {"isInput", jsont::json_boolean(symbol.is_input)},
-       {"isOutput", jsont::json_boolean(symbol.is_output)},
-       {"isStateVar", jsont::json_boolean(symbol.is_state_var)},
-       {"isProperty", jsont::json_boolean(symbol.is_property)},
-       {"isStaticLifetime", jsont::json_boolean(symbol.is_static_lifetime)},
-       {"isThreadLocal", jsont::json_boolean(symbol.is_thread_local)},
-       {"isLvalue", jsont::json_boolean(symbol.is_lvalue)},
-       {"isFileLocal", jsont::json_boolean(symbol.is_file_local)},
-       {"isExtern", jsont::json_boolean(symbol.is_extern)},
-       {"isVolatile", jsont::json_boolean(symbol.is_volatile)},
-       {"isParameter", jsont::json_boolean(symbol.is_parameter)},
-       {"isAuxiliary", jsont::json_boolean(symbol.is_auxiliary)},
-       {"isWeak", jsont::json_boolean(symbol.is_weak)}});
+      {{"prettyName", std::move(pretty_name_json)},
+       {"name", std::move(name_json)},
+       {"baseName", std::move(base_name_json)},
+       {"mode", std::move(mode_json)},
+       {"module", std::move(module_json)},
+       {"prettyType", std::move(pretty_type_json)},
+       {"prettyValue", std::move(pretty_value_json)},
+       {"type", std::move(type_json)},
+       {"value", std::move(value_json)},
+       {"location", std::move(location_json)},
+       {"isType", std::move(is_type_json)},
+       {"isMacro", std::move(is_macro_json)},
+       {"isExported", std::move(is_exported_json)},
+       {"isInput", std::move(is_input_json)},
+       {"isOutput", std::move(is_output_json)},
+       {"isStateVar", std::move(is_state_var_json)},
+       {"isProperty", std::move(is_property_json)},
+       {"isStaticLifetime", std::move(is_static_lifetime_json)},
+       {"isThreadLocal", std::move(is_thread_local_json)},
+       {"isLvalue", std::move(is_lvalue_json)},
+       {"isFileLocal", std::move(is_file_local_json)},
+       {"isExtern", std::move(is_extern_json)},
+       {"isVolatile", std::move(is_volatile_json)},
+       {"isParameter", std::move(is_parameter_json)},
+       {"isAuxiliary", std::move(is_auxiliary_json)},
+       {"isWeak", std::move(is_weak_json)}});
 
     result.push_back(id2string(symbol.name), std::move(symbol_json));
   }
@@ -265,15 +288,19 @@ static void show_symbol_table_brief_json_ui(
     if(symbol.type.is_not_nil())
       ptr->from_type(symbol.type, type_str, ns);
 
+    json_stringt pretty_name_json(symbol.pretty_name);
+    json_stringt base_name_json(symbol.base_name);
+    json_stringt mode_json(symbol.mode);
+    json_stringt module_json(symbol.module);
+    json_stringt pretty_type_json(type_str);
+    jsont type_json(irep_converter.convert_from_irep(symbol.type));
     json_objectt symbol_json(
-      {{"prettyName", json_stringt(symbol.pretty_name)},
-       {"baseName", json_stringt(symbol.base_name)},
-       {"mode", json_stringt(symbol.mode)},
-       {"module", json_stringt(symbol.module)},
-
-       {"prettyType", json_stringt(type_str)},
-
-       {"type", irep_converter.convert_from_irep(symbol.type)}});
+      {{"prettyName", std::move(pretty_name_json)},
+       {"baseName", std::move(base_name_json)},
+       {"mode", std::move(mode_json)},
+       {"module", std::move(module_json)},
+       {"prettyType", std::move(pretty_type_json)},
+       {"type", std::move(type_json)}});
 
     result.push_back(id2string(symbol.name), std::move(symbol_json));
   }