Use make_assumption/assertion wrappers

instead of instructiont constructor. Also a bit of clang-formatting.

Author: petr-bauch

src/analyses/goto_check.cpp

@@ -1490,20 +1490,16 @@ void goto_checkt::add_guarded_claim(
 
   if(assertions.insert(guarded_expr).second)
   {
-    goto_program_instruction_typet type=
-      enable_assert_to_assume?ASSUME:ASSERT;
-
-    goto_programt::targett t = new_code.add(goto_programt::instructiont(
-      static_cast<const codet &>(get_nil_irep()),
-      source_location,
-      type,
-      std::move(guarded_expr),
-      {}));
+    auto t = new_code.add(
+      enable_assert_to_assume ? goto_programt::make_assumption(
+                                  std::move(guarded_expr), source_location)
+                              : goto_programt::make_assertion(
+                                  std::move(guarded_expr), source_location));
 
     std::string source_expr_string;
     get_language_from_mode(mode)->from_expr(src_expr, source_expr_string, ns);
 
-    t->source_location.set_comment(comment+" in "+source_expr_string);
+    t->source_location.set_comment(comment + " in " + source_expr_string);
     t->source_location.set_property_class(property_class);
   }
 }