Merge pull request #4441 from antlechner/antonia/refactor-gen-method-call

Remove unnecessary helper function that adds a function call to a code block

Author: antlechner

jbmc/src/java_bytecode/java_object_factory.cpp

@@ -147,11 +147,6 @@ class java_object_factoryt
     size_t depth,
     const source_locationt &location);
 
-  void gen_method_call_if_present(
-    code_blockt &assignments,
-    const exprt &instance_expr,
-    const irep_idt &method_name);
-
   void array_primitive_init_code(
     code_blockt &assignments,
     const exprt &init_array_expr,
@@ -582,7 +577,8 @@ void java_object_factoryt::gen_nondet_pointer_init(
     {
       const irep_idt &class_name = class_type->get_name();
       const irep_idt class_clinit = clinit_wrapper_name(class_name);
-      gen_method_call_if_present(assignments, expr, class_clinit);
+      if(const auto clinit_func = symbol_table.lookup(class_clinit))
+        assignments.add(code_function_callt{clinit_func->symbol_expr()});
     }
   }
 
@@ -948,7 +944,9 @@ void java_object_factoryt::gen_nondet_struct_init(
 
   const irep_idt init_method_name =
     "java::" + id2string(struct_tag) + ".cproverNondetInitialize:()V";
-  gen_method_call_if_present(assignments, expr, init_method_name);
+  if(const auto init_func = symbol_table.lookup(init_method_name))
+    assignments.add(
+      code_function_callt{init_func->symbol_expr(), {address_of_exprt{expr}}});
 }
 
 /// Initializes a primitive-typed or reference-typed object tree rooted at
@@ -1623,24 +1621,3 @@ void gen_nondet_init(
     update_in_place,
     log);
 }
-
-/// Adds a call for the given method to the end of `assignments` if the method
-/// exists in the symbol table. Does nothing if the method does not exist.
-/// \param assignments: A code block that the method call will be appended to.
-/// \param instance_expr: The instance to call the method on. This argument is
-///   ignored if the method is static.
-/// \param method_name: The name of the method to be called.
-void java_object_factoryt::gen_method_call_if_present(
-  code_blockt &assignments,
-  const exprt &instance_expr,
-  const irep_idt &method_name)
-{
-  if(const auto func = symbol_table.lookup(method_name))
-  {
-    const java_method_typet &type = to_java_method_type(func->type);
-    code_function_callt fun_call(func->symbol_expr());
-    if(type.has_this())
-      fun_call.arguments().push_back(address_of_exprt(instance_expr));
-    assignments.add(fun_call);
-  }
-}

jbmc/src/java_bytecode/java_static_initializers.cpp

@@ -210,21 +210,13 @@ static void clinit_wrapper_do_recursive_calls(
   {
     const auto base_name = base.type().get_identifier();
     irep_idt base_init_routine = clinit_wrapper_name(base_name);
-    auto findit = symbol_table.symbols.find(base_init_routine);
-    if(findit == symbol_table.symbols.end())
-      continue;
-
-    const code_function_callt call_base(findit->second.symbol_expr());
-    init_body.add(call_base);
+    if(const auto base_init_func = symbol_table.lookup(base_init_routine))
+      init_body.add(code_function_callt{base_init_func->symbol_expr()});
   }
 
   const irep_idt &real_clinit_name = clinit_function_name(class_name);
-  auto find_sym_it = symbol_table.symbols.find(real_clinit_name);
-  if(find_sym_it != symbol_table.symbols.end())
-  {
-    const code_function_callt call_real_init(find_sym_it->second.symbol_expr());
-    init_body.add(call_real_init);
-  }
+  if(const auto clinit_func = symbol_table.lookup(real_clinit_name))
+    init_body.add(code_function_callt{clinit_func->symbol_expr()});
 
   // If nondet-static option is given, add a standard nondet initialization for
   // each non-final static field of this class. Note this is the same invocation