remove goto_programt::set_function_call

This removes the deprecated goto_programt::set_function_call method, along
with the two remaining uses.

Author: kroening

src/goto-analyzer/static_simplifier.cpp

@@ -125,22 +125,23 @@ bool static_simplifier(
       }
       else if(i_it->is_function_call())
       {
-        auto fcall = i_it->get_function_call();
+        // copy
+        auto call_function = as_const(*i_it).call_function();
+        auto call_arguments = as_const(*i_it).call_arguments();
 
         bool unchanged =
-          ai.abstract_state_before(i_it)->ai_simplify(fcall.function(), ns);
+          ai.abstract_state_before(i_it)->ai_simplify(call_function, ns);
 
-        exprt::operandst &args=fcall.arguments();
-
-        for(auto &o : args)
+        for(auto &o : call_arguments)
           unchanged &= ai.abstract_state_before(i_it)->ai_simplify(o, ns);
 
         if(unchanged)
           unmodified.function_calls++;
         else
         {
           simplified.function_calls++;
-          i_it->set_function_call(fcall);
+          i_it->call_function() = std::move(call_function);
+          i_it->call_arguments() = std::move(call_arguments);
         }
       }
     }

src/goto-instrument/replace_calls.cpp

@@ -70,12 +70,11 @@ void replace_callst::operator()(
     if(!ins.is_function_call())
       continue;
 
-    auto cfc = ins.get_function_call();
-    exprt &function = cfc.function();
+    const exprt &function = ins.call_function();
 
     PRECONDITION(function.id() == ID_symbol);
 
-    symbol_exprt &se = to_symbol_expr(function);
+    const symbol_exprt &se = to_symbol_expr(function);
     const irep_idt &id = se.get_identifier();
 
     auto f_it1 = goto_functions.function_map.find(id);
@@ -109,10 +108,8 @@ void replace_callst::operator()(
     }
 
     // Finally modify the call
-    function.type() = ns.lookup(f_it2->first).type;
-    se.set_identifier(new_id);
-
-    ins.set_function_call(cfc);
+    ins.call_function().type() = ns.lookup(f_it2->first).type;
+    to_symbol_expr(ins.call_function()).set_identifier(new_id);
   }
 }
 

src/goto-programs/goto_program.h

@@ -399,20 +399,6 @@ class goto_programt
       return to_code_function_call(code).arguments();
     }
 
-    /// Set the function call for FUNCTION_CALL
-#if 1
-    DEPRECATED(SINCE(
-      2021,
-      2,
-      24,
-      "Use call_function(), call_lhs(), call_arguments() instead"))
-    void set_function_call(code_function_callt c)
-    {
-      PRECONDITION(is_function_call());
-      code = std::move(c);
-    }
-#endif
-
     /// Get the statement for OTHER
     const codet &get_other() const
     {

src/goto-programs/remove_virtual_functions.cpp

@@ -93,19 +93,20 @@ class remove_virtual_functionst
 /// \param function_symbol: the function to be called
 /// \param ns: namespace
 static void create_static_function_call(
-  code_function_callt &call,
+  goto_programt::instructiont &call,
   const symbol_exprt &function_symbol,
   const namespacet &ns)
 {
-  call.function() = function_symbol;
+  call.call_function() = function_symbol;
+
   // Cast the pointers to the correct type for the new callee:
   // Note the `this` pointer is expected to change type, but other pointers
   // could also change due to e.g. using a different alias to refer to the same
   // type (in Java, for example, we see ArrayList.add(ArrayList::E arg)
   // overriding Collection.add(Collection::E arg))
   const auto &callee_parameters =
     to_code_type(ns.lookup(function_symbol.get_identifier()).type).parameters();
-  auto &call_args = call.arguments();
+  auto &call_args = call.call_arguments();
 
   INVARIANT(
     callee_parameters.size() == call_args.size(),
@@ -288,11 +289,8 @@ static goto_programt::targett replace_virtual_function_with_dispatch_table(
       remove_skip(goto_program, target, next_target);
     }
     else
-    {
-      auto c = target->get_function_call();
-      create_static_function_call(c, *functions.front().symbol_expr, ns);
-      target->set_function_call(c);
-    }
+      create_static_function_call(*target, *functions.front().symbol_expr, ns);
+
     return next_target;
   }
 
@@ -361,13 +359,11 @@ static goto_programt::targett replace_virtual_function_with_dispatch_table(
     {
       if(fun.symbol_expr.has_value())
       {
-        // call function
-        auto new_call = code;
+        auto new_call = *target; // copy
 
         create_static_function_call(new_call, *fun.symbol_expr, ns);
 
-        goto_programt::targett t1 = new_code_calls.add(
-          goto_programt::make_function_call(new_call, vcall_source_loc));
+        goto_programt::targett t1 = new_code_calls.add(std::move(new_call));
 
         insertit.first->second = t1;
       }