Use constructors to build code(-like) objects

Don't do incremental updates which may result in objects that do not match what
we build via constructors.

Author: tautschnig

src/cpp/cpp_typecheck_constructor.cpp

@@ -349,12 +349,7 @@ void cpp_typecheckt::default_assignop_value(
   source_locationt source_location=declarator.source_location();
   declarator.make_nil();
 
-  declarator.value().add_source_location()=source_location;
-  declarator.value().id(ID_code);
-  declarator.value().set(ID_statement, ID_block);
-  declarator.value().type() = code_typet({}, empty_typet());
-
-  exprt &block=declarator.value();
+  code_blockt block;
 
   std::string arg_name("ref");
 
@@ -405,12 +400,11 @@ void cpp_typecheckt::default_assignop_value(
   }
 
   // Finally we add the return statement
-  block.operands().push_back(exprt(ID_code));
-  exprt &ret_code=declarator.value().operands().back();
-  ret_code.operands().push_back(exprt(ID_dereference));
-  ret_code.op0().operands().push_back(exprt("cpp-this"));
-  ret_code.set(ID_statement, ID_return);
-  ret_code.type() = code_typet({}, empty_typet());
+  block.add(
+    code_returnt(dereference_exprt(exprt("cpp-this"), uninitialized_typet())));
+
+  declarator.value() = std::move(block);
+  declarator.value().add_source_location() = source_location;
 }
 
 /// Check a constructor initialization-list. An initializer has to be a data

src/cpp/cpp_typecheck_expr.cpp

@@ -1963,8 +1963,8 @@ void cpp_typecheckt::typecheck_side_effect_function_call(
   else if(expr.function().id() == ID_cpp_dummy_destructor)
   {
     // these don't do anything, e.g., (char*)->~char()
-    expr.set(ID_statement, ID_skip);
-    expr.type()=empty_typet();
+    typecast_exprt no_op(from_integer(0, signed_int_type()), void_type());
+    expr.swap(no_op);
     return;
   }
 

src/jsil/parser.y

@@ -198,9 +198,8 @@ statements_opt: /* empty */
 
 statements: statement
           {
-            newstack($$).id(ID_code);
-            to_code(stack($$)).set_statement(ID_block);
-            stack($$).add_to_operands(std::move(stack($1)));
+            code_blockt b({static_cast<codet &>(stack($1))});
+            newstack($$).swap(b);
           }
           | statements statement
           {