Fix based on review comments

will be squashed.

Author: petr-bauch

src/goto-harness/recursive_initialization.cpp

@@ -321,10 +321,10 @@ bool recursive_initializationt::should_be_treated_as_array(
          initialization_config.pointers_to_treat_as_arrays.end();
 }
 
-optionalt<std::size_t>
+optionalt<recursive_initializationt::equal_cluster_idt>
 recursive_initializationt::find_equal_cluster(const irep_idt &name) const
 {
-  for(size_t index = 0;
+  for(equal_cluster_idt index = 0;
       index != initialization_config.pointers_to_treat_equal.size();
       ++index)
   {
@@ -820,10 +820,7 @@ code_blockt recursive_initializationt::build_dynamic_array_constructor(
 
 bool recursive_initializationt::needs_freeing(const exprt &expr) const
 {
-  if(expr.type().id() != ID_pointer || expr.type().id() == ID_code)
-    return false;
-  else
-    return true;
+  return expr.type().id() == ID_pointer && expr.type().id() != ID_code;
 }
 
 void recursive_initializationt::free_if_possible(
@@ -846,9 +843,9 @@ void recursive_initializationt::free_if_possible(
         .get_identifier() != expr_id &&
     initialization_config.arguments_may_be_equal)
   {
-    // in equality cluster but not common origin -> free if equal to origin
+    // in equality cluster but not common origin -> free if not equal to origin
     const auto condition =
-      equal_exprt{expr, *common_arguments_origins[*maybe_cluster_index]};
+      notequal_exprt{expr, *common_arguments_origins[*maybe_cluster_index]};
     body.add(code_ifthenelset{condition, call_free});
   }
   else

src/goto-harness/recursive_initialization.h

@@ -60,6 +60,7 @@ class recursive_initializationt
 public:
   using recursion_sett = std::set<irep_idt>;
   using type_constructor_namest = std::map<typet, irep_idt>;
+  using equal_cluster_idt = std::size_t;
 
   recursive_initializationt(
     recursive_initialization_configt initialization_config,
@@ -102,7 +103,7 @@ class recursive_initializationt
   symbol_exprt get_malloc_function();
 
   bool should_be_treated_as_array(const irep_idt &pointer_name) const;
-  optionalt<std::size_t> find_equal_cluster(const irep_idt &name) const;
+  optionalt<equal_cluster_idt> find_equal_cluster(const irep_idt &name) const;
   bool is_array_size_parameter(const irep_idt &cmdline_arg) const;
   optionalt<irep_idt>
   get_associated_size_variable(const irep_idt &array_name) const;