PR Feedback implementation

Simplifying assert
Simplify and reducing indentation by changing if branches with trivial
else clauses into checking them first and bailing if condition not met.
Corrected use of reference

Author: thk123

src/analyses/does_remove_const.cpp

@@ -55,24 +55,25 @@ bool does_remove_constt::operator()() const
   for(const goto_programt::instructiont &instruction :
     goto_program.instructions)
   {
-    if(instruction.is_assign())
+    if(!instruction.is_assign())
     {
-      const code_assignt assign=to_code_assign(instruction.code);
-      const typet &rhs_type=assign.rhs().type();
-      const typet &lhs_type=assign.lhs().type();
+      continue;
+    }
 
-      // Compare the types recursively for a point where the rhs is more
-      // const that the lhs
-      if(!is_type_at_least_as_const_as(lhs_type, rhs_type))
-      {
-        return true;
-      }
+    const code_assignt &assign=to_code_assign(instruction.code);
+    const typet &rhs_type=assign.rhs().type();
+    const typet &lhs_type=assign.lhs().type();
 
-      bool sub_expr_lose_const=does_expr_lose_const(assign.rhs());
-      if(sub_expr_lose_const)
-      {
-        return true;
-      }
+    // Compare the types recursively for a point where the rhs is more
+    // const that the lhs
+    if(!is_type_at_least_as_const_as(lhs_type, rhs_type))
+    {
+      return true;
+    }
+
+    if(does_expr_lose_const(assign.rhs()))
+    {
+      return true;
     }
   }
 

src/goto-programs/remove_const_function_pointers.cpp

@@ -501,7 +501,7 @@ Function: remove_const_function_pointerst::try_resolve_expression
 bool remove_const_function_pointerst::try_resolve_expression(
   const exprt &expr, expressionst &out_resolved_expression, bool &out_is_const)
 {
-  const exprt &simplified_expr=simplify_expr(expr, ns);
+  exprt simplified_expr=simplify_expr(expr, ns);
   bool resolved;
   expressionst resolved_expressions;
   bool is_resolved_expression_const;
@@ -693,25 +693,19 @@ bool remove_const_function_pointerst::try_resolve_index_of(
               try_resolve_expression(
                 array_entry, array_contents, is_entry_const);
 
-            if(resolved_value)
-            {
-              for(const exprt &resolved_array_entry : array_contents)
-              {
-                if(resolved_array_entry .is_zero())
-                {
-                  continue;
-                }
-                else
-                {
-                  out_expressions.push_back(resolved_array_entry);
-                }
-              }
-            }
-            else
+            if(!resolved_value)
             {
               LOG("Failed to resolve array value", array_entry);
               return false;
             }
+
+            for(const exprt &resolved_array_entry : array_contents)
+            {
+              if(!resolved_array_entry.is_zero())
+              {
+                out_expressions.push_back(resolved_array_entry);
+              }
+            }
           }
         }
       }

src/goto-programs/remove_function_pointers.cpp

@@ -374,13 +374,10 @@ void remove_function_pointerst::remove_function_pointer(
 
     found_functions=fpr(functions);
 
-    // Consistency checks
-    // Reported optimized function pointer call, but didn't find any functions
-    assert(!found_functions || !functions.empty());
-
-    // Reported didn't optimize function pointer call, but did find some
-    // functions to replace with
-    assert(found_functions || functions.empty());
+    // Either found_functions is true therefore the functions should not
+    // be empty
+    // Or found_functions is false therefore the functions should be empty
+    assert(found_functions != functions.empty());
 
     if(functions.size()==1)
     {