Invert the iterator check to reduce cognitive load caused by extended block scope

Author: NathanJPhillips

jbmc/src/java_bytecode/java_bytecode_convert_class.cpp

@@ -1030,23 +1030,21 @@ static void find_and_replace_parameter(
              get_final_name_component(
                id2string(replacement_param.type_variable().get_identifier()));
     });
+  if(replacement_parameter_it == replacement_parameters.end())
+    return;
 
-  // if a replacement parameter was found, update the identifier
-  if(replacement_parameter_it != replacement_parameters.end())
-  {
-    const std::string &replacement_parameter_full_name =
-      id2string(replacement_parameter_it->type_variable().get_identifier());
-
-    // the replacement parameter is a viable one, i.e., it comes from an outer
-    // class
-    PRECONDITION(
-      get_without_final_name_component(parameter_full_name)
-        .compare(get_without_final_name_component(
-          replacement_parameter_full_name)) > 0);
-
-    parameter.type_variable_ref().set_identifier(
-      replacement_parameter_full_name);
-  }
+  // A replacement parameter was found, update the identifier
+  const std::string &replacement_parameter_full_name =
+    id2string(replacement_parameter_it->type_variable().get_identifier());
+
+  // the replacement parameter is a viable one, i.e., it comes from an outer
+  // class
+  PRECONDITION(
+    get_without_final_name_component(parameter_full_name)
+      .compare(
+        get_without_final_name_component(replacement_parameter_full_name)) > 0);
+
+  parameter.type_variable_ref().set_identifier(replacement_parameter_full_name);
 }
 
 /// Recursively find all generic type parameters of a given type and replace

jbmc/src/java_bytecode/select_pointer_type.cpp

@@ -89,17 +89,15 @@ pointer_typet select_pointer_typet::specialize_generics(
     // if the pointer is an array, recursively specialize its element type
     const auto *array_element_type =
       type_try_dynamic_cast<pointer_typet>(java_array_element_type(*subtype));
-    if(array_element_type != nullptr)
-    {
-      const pointer_typet &new_array_type = specialize_generics(
-        *array_element_type,
-        generic_parameter_specialization_map,
-        visited_nodes);
-
-      pointer_typet replacement_array_type = java_array_type('a');
-      replacement_array_type.subtype().set(ID_element_type, new_array_type);
-      return replacement_array_type;
-    }
+    if(array_element_type == nullptr)
+      return pointer_type;
+
+    const pointer_typet &new_array_type = specialize_generics(
+      *array_element_type, generic_parameter_specialization_map, visited_nodes);
+
+    pointer_typet replacement_array_type = java_array_type('a');
+    replacement_array_type.subtype().set(ID_element_type, new_array_type);
+    return replacement_array_type;
   }
 
   return pointer_type;