Switch push_back to emplace_back when constructing parse_trees.

thomasspriggs · thomasspriggs · commit a37ee77e934b · 2018-05-24T21:04:55.000+01:00
diff --git a/jbmc/src/java_bytecode/java_class_loader.cpp b/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(std::move(*parse_tree));
+      parse_trees.emplace_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(std::move(*parse_tree));
+        parse_trees.emplace_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(std::move(*parse_tree));
+        parse_trees.emplace_back(std::move(*parse_tree));
     }
     else
     {
@@ -192,7 +192,7 @@ java_class_loadert::get_parse_tree(
         optionalt<java_bytecode_parse_treet> parse_tree =
           java_bytecode_parse(full_path, get_message_handler());
         if(parse_tree)
-          parse_trees.push_back(std::move(*parse_tree));
+          parse_trees.emplace_back(std::move(*parse_tree));
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ java_class_loadert::get_parse_tree(`
`133`	`133`	`optionalt<java_bytecode_parse_treet> parse_tree =`
`134`	`134`	`get_class_from_jar(class_name, jar_file, *index, class_loader_limit);`
`135`	`135`	`if(parse_tree)`
`136`		`- parse_trees.push_back(std::move(*parse_tree));`
	`136`	`+ parse_trees.emplace_back(std::move(*parse_tree));`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`// Then add core models`
`@@ -153,7 +153,7 @@ java_class_loadert::get_parse_tree(`
`153`	`153`	`optionalt<java_bytecode_parse_treet> parse_tree =`
`154`	`154`	`get_class_from_jar(class_name, core_models, *index, class_loader_limit);`
`155`	`155`	`if(parse_tree)`
`156`		`- parse_trees.push_back(std::move(*parse_tree));`
	`156`	`+ parse_trees.emplace_back(std::move(*parse_tree));`
`157`	`157`	`}`
`158`	`158`	`}`
`159`	`159`
`@@ -168,7 +168,7 @@ java_class_loadert::get_parse_tree(`
`168`	`168`	`optionalt<java_bytecode_parse_treet> parse_tree =`
`169`	`169`	`get_class_from_jar(class_name, cp_entry, *index, class_loader_limit);`
`170`	`170`	`if(parse_tree)`
`171`		`- parse_trees.push_back(std::move(*parse_tree));`
	`171`	`+ parse_trees.emplace_back(std::move(*parse_tree));`
`172`	`172`	`}`
`173`	`173`	`else`
`174`	`174`	`{`
`@@ -192,7 +192,7 @@ java_class_loadert::get_parse_tree(`
`192`	`192`	`optionalt<java_bytecode_parse_treet> parse_tree =`
`193`	`193`	`java_bytecode_parse(full_path, get_message_handler());`
`194`	`194`	`if(parse_tree)`
`195`		`- parse_trees.push_back(std::move(*parse_tree));`
	`195`	`+ parse_trees.emplace_back(std::move(*parse_tree));`
`196`	`196`	`}`
`197`	`197`	`}`
`198`	`198`	`}`