Fix instances where copying was being used instead of moving.

Author: thomasspriggs

jbmc/src/java_bytecode/java_bytecode_parser.cpp

@@ -1702,7 +1702,7 @@ java_bytecode_parse(std::istream &istream, message_handlert &message_handler)
     return {};
   }
 
-  return java_bytecode_parser.parse_tree;
+  return std::move(java_bytecode_parser.parse_tree);
 }
 
 optionalt<class java_bytecode_parse_treet>

jbmc/src/java_bytecode/java_class_loader.cpp

@@ -133,7 +133,7 @@ java_class_loadert::get_parse_tree(
     optionalt<java_bytecode_parse_treet> parse_tree =
       get_class_from_jar(class_name, jar_file, *index, class_loader_limit);
     if(parse_tree)
-      parse_trees.push_back(*parse_tree);
+      parse_trees.push_back(std::move(*parse_tree));
   }
 
   // Then add core models
@@ -153,7 +153,7 @@ java_class_loadert::get_parse_tree(
       optionalt<java_bytecode_parse_treet> parse_tree =
         get_class_from_jar(class_name, core_models, *index, class_loader_limit);
       if(parse_tree)
-        parse_trees.push_back(*parse_tree);
+        parse_trees.push_back(std::move(*parse_tree));
     }
   }
 
@@ -168,7 +168,7 @@ java_class_loadert::get_parse_tree(
       optionalt<java_bytecode_parse_treet> parse_tree =
         get_class_from_jar(class_name, cp_entry, *index, class_loader_limit);
       if(parse_tree)
-        parse_trees.push_back(*parse_tree);
+        parse_trees.push_back(std::move(*parse_tree));
     }
     else
     {

jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/java_bytecode_parse_lambda_method_table.cpp

@@ -41,7 +41,7 @@ SCENARIO(
       {
         REQUIRE(parse_tree);
         REQUIRE(parse_tree->loading_successful);
-        const java_bytecode_parse_treet::classt parsed_class =
+        const java_bytecode_parse_treet::classt &parsed_class =
           parse_tree->parsed_class;
         REQUIRE(parsed_class.attribute_bootstrapmethods_read);
         REQUIRE(parsed_class.lambda_method_handle_map.size() == 12);
@@ -352,7 +352,7 @@ SCENARIO(
         {
           REQUIRE(parse_tree);
           REQUIRE(parse_tree->loading_successful);
-          const java_bytecode_parse_treet::classt parsed_class =
+          const java_bytecode_parse_treet::classt &parsed_class =
             parse_tree->parsed_class;
           REQUIRE(parsed_class.attribute_bootstrapmethods_read);
           REQUIRE(parsed_class.lambda_method_handle_map.size() == 12);
@@ -661,7 +661,7 @@ SCENARIO(
         {
           REQUIRE(parse_tree);
           REQUIRE(parse_tree->loading_successful);
-          const java_bytecode_parse_treet::classt parsed_class =
+          const java_bytecode_parse_treet::classt &parsed_class =
             parse_tree->parsed_class;
           REQUIRE(parsed_class.attribute_bootstrapmethods_read);
           REQUIRE(parsed_class.lambda_method_handle_map.size() == 12);
@@ -996,7 +996,7 @@ SCENARIO(
         {
           REQUIRE(parse_tree);
           REQUIRE(parse_tree->loading_successful);
-          const java_bytecode_parse_treet::classt parsed_class =
+          const java_bytecode_parse_treet::classt &parsed_class =
             parse_tree->parsed_class;
           REQUIRE(parsed_class.attribute_bootstrapmethods_read);
           REQUIRE(parsed_class.lambda_method_handle_map.size() == 3);