Merge pull request diffblue#3589 from tautschnig/std-move-cleanup

Cleanup uses of std::move

Author: tautschnig

jbmc/src/java_bytecode/character_refine_preprocess.cpp

@@ -1249,8 +1249,7 @@ exprt character_refine_preprocesst::expr_of_to_lower_case(
   minus_exprt transformed(
     plus_exprt(chr, from_integer('a', type)), from_integer('A', type));
 
-  if_exprt res(expr_of_is_ascii_upper_case(chr, type), transformed, chr);
-  return std::move(res);
+  return if_exprt(expr_of_is_ascii_upper_case(chr, type), transformed, chr);
 }
 
 /// Converts function call to an assignment of an expression corresponding to
@@ -1292,7 +1291,7 @@ exprt character_refine_preprocesst::expr_of_to_title_case(
   or_exprt plus_8_set(
     plus_8_interval1, or_exprt(plus_8_interval2, plus_8_interval3));
 
-  if_exprt res(
+  return if_exprt(
     in_list_expr(chr, increment_list),
     plus_1,
     if_exprt(
@@ -1301,12 +1300,7 @@ exprt character_refine_preprocesst::expr_of_to_title_case(
       if_exprt(
         plus_8_set,
         plus_8,
-        if_exprt(
-          in_list_expr(chr, plus_9_list),
-          plus_9,
-          chr))));
-
-  return std::move(res);
+        if_exprt(in_list_expr(chr, plus_9_list), plus_9, chr))));
 }
 
 /// Converts function call to an assignment of an expression corresponding to
@@ -1342,8 +1336,7 @@ exprt character_refine_preprocesst::expr_of_to_upper_case(
   minus_exprt transformed(
     plus_exprt(chr, from_integer('A', type)), from_integer('a', type));
 
-  if_exprt res(expr_of_is_ascii_lower_case(chr, type), transformed, chr);
-  return std::move(res);
+  return if_exprt(expr_of_is_ascii_lower_case(chr, type), transformed, chr);
 }
 
 /// Converts function call to an assignment of an expression corresponding to

jbmc/src/java_bytecode/java_bytecode_instrument.cpp

@@ -526,7 +526,7 @@ optionalt<codet> java_bytecode_instrumentt::instrument_expr(const exprt &expr)
           expr.get_bool(ID_java_member_access))
   {
     // Check pointer non-null before access:
-    const dereference_exprt dereference_expr=to_dereference_expr(expr);
+    const dereference_exprt &dereference_expr = to_dereference_expr(expr);
     codet null_dereference_check=
       check_null_dereference(
         dereference_expr.op0(),

jbmc/src/java_bytecode/java_bytecode_language.cpp

@@ -1067,7 +1067,7 @@ bool java_bytecode_languaget::convert_single_method(
         symbol, cmb->get().method.local_variable_table, symbol_table);
     }
     // Populate body of the function with code generated by string preprocess
-    const codet generated_code =
+    codet generated_code =
       string_preprocess.code_for_function(symbol, symbol_table);
     // String solver can make calls to functions that haven't yet been seen.
     // Add these to the needed_lazy_methods collection

jbmc/src/java_bytecode/java_object_factory.cpp

@@ -1460,8 +1460,7 @@ void java_object_factoryt::gen_nondet_array_init(
   code_labelt init_done_label(done_name, code_skipt());
   code_gotot goto_done(done_name);
 
-  const code_ifthenelset done_test(
-    equal_exprt(counter_expr, length_expr), goto_done);
+  code_ifthenelset done_test(equal_exprt(counter_expr, length_expr), goto_done);
 
   assignments.add(std::move(done_test));
 

src/ansi-c/ansi_c_entry_point.cpp

@@ -264,10 +264,10 @@ bool generate_ansi_c_start_function(
         // assume argc is at least one
         exprt one=from_integer(1, argc_symbol.type);
 
-        const binary_relation_exprt ge(argc_symbol.symbol_expr(), ID_ge, one);
+        binary_relation_exprt ge(
+          argc_symbol.symbol_expr(), ID_ge, std::move(one));
 
-        code_assumet assumption(ge);
-        init_code.add(std::move(assumption));
+        init_code.add(code_assumet(std::move(ge)));
       }
 
       {
@@ -277,11 +277,10 @@ bool generate_ansi_c_start_function(
 
         exprt bound_expr=from_integer(upper_bound, argc_symbol.type);
 
-        const binary_relation_exprt le(
-          argc_symbol.symbol_expr(), ID_le, bound_expr);
+        binary_relation_exprt le(
+          argc_symbol.symbol_expr(), ID_le, std::move(bound_expr));
 
-        code_assumet assumption(le);
-        init_code.add(std::move(assumption));
+        init_code.add(code_assumet(std::move(le)));
       }
 
       {
@@ -314,11 +313,10 @@ bool generate_ansi_c_start_function(
 
         exprt max_minus_one=from_integer(max-1, envp_size_symbol.type);
 
-        const binary_relation_exprt le(
-          envp_size_symbol.symbol_expr(), ID_le, max_minus_one);
+        binary_relation_exprt le(
+          envp_size_symbol.symbol_expr(), ID_le, std::move(max_minus_one));
 
-        code_assumet assumption(le);
-        init_code.add(std::move(assumption));
+        init_code.add(code_assumet(le));
       }
 
       {
@@ -362,18 +360,16 @@ bool generate_ansi_c_start_function(
         const symbolt &envp_size_symbol=ns.lookup("envp_size'");
 
         // assume envp[envp_size] is NULL
-        const null_pointer_exprt null(
-          to_pointer_type(envp_symbol.type.subtype()));
+        null_pointer_exprt null(to_pointer_type(envp_symbol.type.subtype()));
 
         index_exprt index_expr(
           envp_symbol.symbol_expr(), envp_size_symbol.symbol_expr());
         // disable bounds check on that one
         index_expr.set("bounds_check", false);
 
-        const equal_exprt is_null(index_expr, null);
+        equal_exprt is_null(std::move(index_expr), std::move(null));
 
-        code_assumet assumption2(is_null);
-        init_code.add(std::move(assumption2));
+        init_code.add(code_assumet(is_null));
       }
 
       {

src/ansi-c/c_nondet_symbol_factory.cpp

@@ -146,8 +146,7 @@ void symbol_factoryt::gen_nondet_init(
         recursion_set.find(struct_tag) != recursion_set.end() &&
         depth >= object_factory_params.max_nondet_tree_depth)
       {
-        code_assignt c(expr, null_pointer_exprt(pointer_type));
-        assignments.add(std::move(c));
+        assignments.add(code_assignt(expr, null_pointer_exprt(pointer_type)));
 
         return;
       }

src/cpp/cpp_constructor.cpp

@@ -192,7 +192,7 @@ optionalt<codet> cpp_typecheckt::cpp_constructor(
       side_effect_exprt assign(ID_assign, typet(), source_location);
       assign.move_to_operands(member, val);
       typecheck_side_effect_assignment(assign);
-      block.add(std::move(code_expressiont(assign)));
+      block.add(code_expressiont(std::move(assign)));
     }
 
     // enter struct scope

src/goto-programs/interpreter.cpp

@@ -625,11 +625,7 @@ exprt interpretert::get_value(
         return address_of_exprt(member_expr);
       }
 
-      index_exprt index_expr(
-        symbol_expr,
-        from_integer(offset, integer_typet()));
-
-      return std::move(index_expr);
+      return index_exprt(symbol_expr, from_integer(offset, integer_typet()));
     }
 
     error() << "interpreter: invalid pointer "

src/goto-programs/string_abstraction.cpp

@@ -1367,7 +1367,5 @@ exprt string_abstractiont::member(const exprt &a, whatt what)
   case whatt::LENGTH: component_name="length"; break;
   }
 
-  member_exprt result(struct_op, component_name, build_type(what));
-
-  return std::move(result);
+  return member_exprt(struct_op, component_name, build_type(what));
 }

src/pointer-analysis/pointer_offset_sum.cpp

@@ -24,6 +24,5 @@ exprt pointer_offset_sum(const exprt &a, const exprt &b)
   else if(b.is_zero())
     return a;
 
-  plus_exprt new_offset(a, typecast_exprt::conditional_cast(b, a.type()));
-  return std::move(new_offset);
+  return plus_exprt(a, typecast_exprt::conditional_cast(b, a.type()));
 }

src/solvers/flattening/boolbv_get.cpp

@@ -169,16 +169,12 @@ exprt boolbvt::bv_get_rec(
       // Any idea that's better than just returning the first component?
       std::size_t component_nr=0;
 
-      union_exprt value(union_type);
+      const typet &subtype = components[component_nr].type();
 
-      value.set_component_name(
-        components[component_nr].get_name());
-
-      const typet &subtype=components[component_nr].type();
-
-      value.op()=bv_get_rec(bv, unknown, offset, subtype);
-
-      return std::move(value);
+      return union_exprt(
+        components[component_nr].get_name(),
+        bv_get_rec(bv, unknown, offset, subtype),
+        union_type);
     }
     else if(type.id()==ID_vector)
     {

src/solvers/flattening/pointer_logic.cpp

@@ -78,8 +78,7 @@ exprt pointer_logict::pointer_expr(
   {
     if(pointer.offset==0)
     {
-      null_pointer_exprt result(type);
-      return std::move(result);
+      return null_pointer_exprt(type);
     }
     else
     {

src/solvers/refinement/string_constraint_generator_code_points.cpp

@@ -109,8 +109,7 @@ exprt pair_value(exprt char1, exprt char2, typet return_type)
   exprt hex0400=from_integer(0x0400, return_type);
   mult_exprt m1(mod_exprt(char1, hex0800), hex0400);
   mod_exprt m2(char2, hex0400);
-  plus_exprt pair_value(hex010000, plus_exprt(m1, m2));
-  return std::move(pair_value);
+  return plus_exprt(hex010000, plus_exprt(m1, m2));
 }
 
 /// add axioms corresponding to the String.codePointAt java function

src/solvers/smt2/smt2_parser.cpp

@@ -413,7 +413,7 @@ exprt smt2_parsert::function_application_ieee_float_op(
     throw error("unsupported floating-point operation");
   // clang-format on
 
-  return std::move(ieee_float_op_exprt(op[1], expr_id, op[2], op[0]));
+  return ieee_float_op_exprt(op[1], expr_id, op[2], op[0]);
 }
 
 exprt smt2_parsert::function_application_fp(const exprt::operandst &op)
@@ -441,8 +441,7 @@ exprt smt2_parsert::function_application_fp(const exprt::operandst &op)
   concatenation_exprt c(bv_typet(width_e + width_f + 1));
   c.operands() = {op[0], op[1], op[2]};
 
-  return std::move(
-    typecast_exprt(c, ieee_float_spect(width_f, width_e).to_type()));
+  return typecast_exprt(c, ieee_float_spect(width_f, width_e).to_type());
 }
 
 exprt smt2_parsert::function_application()