Merge pull request #5399 from hannes-steffenhagen-diffblue/refactor/avoid-unnecessary-copy

Refactor/avoid unnecessary copy

Author: hannes-steffenhagen-diffblue

jbmc/src/java_bytecode/java_types.cpp

@@ -946,7 +946,7 @@ void get_dependencies_from_generic_parameters_rec(
   // Java generic type that holds different types in its type arguments
   if(is_java_generic_type(t))
   {
-    for(const auto type_arg : to_java_generic_type(t).generic_type_arguments())
+    for(const auto &type_arg : to_java_generic_type(t).generic_type_arguments())
       get_dependencies_from_generic_parameters_rec(type_arg, refs);
   }
 
@@ -1126,7 +1126,7 @@ std::string pretty_signature(const java_method_typet &method_type)
   result << '(';
 
   bool first = true;
-  for(const auto p : method_type.parameters())
+  for(const auto &p : method_type.parameters())
   {
     if(p.get_this())
       continue;

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

@@ -263,7 +263,7 @@ require_goto_statements::find_pointer_assignments(
   }
 
   std::ostringstream found_symbols;
-  for(const auto entry : all_symbols)
+  for(const auto &entry : all_symbols)
   {
     found_symbols << entry << std::endl;
   }

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

@@ -60,7 +60,7 @@ const require_parse_tree::methodt require_parse_tree::require_method(
 
   INFO("Looking for method: " << method_name);
   std::ostringstream found_methods;
-  for(const auto entry : parsed_class.methods)
+  for(const auto &entry : parsed_class.methods)
   {
     found_methods << id2string(entry.name) << std::endl;
   }
@@ -80,7 +80,7 @@ void require_parse_tree::require_instructions_match_expectation(
 {
   REQUIRE(instructions.size() == expected_instructions.size());
   auto actual_instruction_it = instructions.begin();
-  for(const auto expected_instruction : expected_instructions)
+  for(const auto &expected_instruction : expected_instructions)
   {
     expected_instruction.require_instructions_equal(*actual_instruction_it);
     ++actual_instruction_it;

jbmc/unit/java_bytecode/java_bytecode_convert_class/add_java_array_types.cpp

@@ -27,7 +27,7 @@ TEST_CASE("Add array types", "[core]")
 
   SECTION("Array class symbol exists")
   {
-    for(const std::string array_type : array_types)
+    for(const std::string &array_type : array_types)
     {
       const auto array_type_symbol = require_symbol::require_symbol_exists(
         symbol_table, "java::array[" + array_type + "]");
@@ -38,7 +38,7 @@ TEST_CASE("Add array types", "[core]")
   }
   SECTION("Array clone method exists")
   {
-    for(const std::string array_type : array_types)
+    for(const std::string &array_type : array_types)
     {
       const auto array_type_symbol = require_symbol::require_symbol_exists(
         symbol_table,

jbmc/unit/java_bytecode/java_bytecode_convert_method/convert_method.cpp

@@ -938,7 +938,7 @@ TEST_CASE(
   other_param.type() = java_lang_object_type();
   java_method_typet::parameterst parameters{
     this_param, ref_to_inner, other_param};
-  for(const auto param : parameters)
+  for(const auto &param : parameters)
   {
     REQUIRE(param.get_identifier().empty());
     REQUIRE(param.get_base_name().empty());

src/cbmc/c_test_input_generator.cpp

@@ -137,7 +137,7 @@ void c_test_input_generatort::operator()(const goto_trace_storaget &traces)
   {
   case ui_message_handlert::uit::PLAIN:
     log.result() << "\nTest suite:\n";
-    for(const auto trace : traces.all())
+    for(const auto &trace : traces.all())
     {
       test_inputst test_inputs = (*this)(trace, ns);
       test_inputs.output_plain_text(log.result(), ns, trace);
@@ -153,15 +153,15 @@ void c_test_input_generatort::operator()(const goto_trace_storaget &traces)
     json_stream_arrayt &tests_array =
       json_result.push_back_stream_array("tests");
 
-    for(const auto trace : traces.all())
+    for(const auto &trace : traces.all())
     {
       test_inputst test_inputs = (*this)(trace, ns);
       tests_array.push_back(test_inputs.to_json(ns, trace, print_trace));
     }
     break;
   }
   case ui_message_handlert::uit::XML_UI:
-    for(const auto trace : traces.all())
+    for(const auto &trace : traces.all())
     {
       test_inputst test_inputs = (*this)(trace, ns);
       log.result() << test_inputs.to_xml(ns, trace, print_trace);

src/goto-checker/report_util.cpp

@@ -473,7 +473,7 @@ static void output_fault_localization_plain(
   messaget &log)
 {
   log.result() << "\n** Most likely fault location:" << messaget::eom;
-  for(const auto fault_location_pair : fault_locations)
+  for(const auto &fault_location_pair : fault_locations)
   {
     output_fault_localization_plain(
       fault_location_pair.first, fault_location_pair.second, log);
@@ -509,7 +509,7 @@ static void output_fault_localization_xml(
   messaget &log)
 {
   xmlt dest("fault-localization");
-  for(const auto fault_location_pair : fault_locations)
+  for(const auto &fault_location_pair : fault_locations)
   {
     xmlt xml_diagnosis =
       xml(fault_location_pair.first, fault_location_pair.second, log);

src/goto-diff/unified_diff.cpp

@@ -368,7 +368,7 @@ void unified_difft::output(std::ostream &os) const
 {
   goto_programt empty;
 
-  for(const std::pair<irep_idt, differencest> &p : differences_map_)
+  for(auto const &p : differences_map_)
   {
     const irep_idt &function = p.first;
 

src/goto-instrument/count_eloc.cpp

@@ -54,8 +54,8 @@ void count_eloc(const goto_modelt &goto_model)
   working_dirst eloc_map;
   collect_eloc(goto_model, eloc_map);
 
-  for(const std::pair<irep_idt, filest> &files : eloc_map)
-    for(const std::pair<irep_idt, linest> &lines : files.second)
+  for(auto const &files : eloc_map)
+    for(auto const &lines : files.second)
       eloc+=lines.second.size();
 
   std::cout << "Effective lines of code: " << eloc << '\n';
@@ -66,8 +66,8 @@ void list_eloc(const goto_modelt &goto_model)
   working_dirst eloc_map;
   collect_eloc(goto_model, eloc_map);
 
-  for(const std::pair<irep_idt, filest> &files : eloc_map)
-    for(const std::pair<irep_idt, linest> &lines : files.second)
+  for(auto const &files : eloc_map)
+    for(auto const &lines : files.second)
     {
       std::string file=id2string(lines.first);
       if(!files.first.empty())

src/langapi/language_file.h

@@ -84,7 +84,7 @@ class language_filest:public messaget
     // Clear relevant entries from lazy_method_map
     language_filet *language_file = &file_map.at(filename);
     std::unordered_set<irep_idt> files_methods;
-    for(const std::pair<irep_idt, language_filet *> &method : lazy_method_map)
+    for(auto const &method : lazy_method_map)
     {
       if(method.second == language_file)
         files_methods.insert(method.first);