Updates requested in PR - mainly rename of functions.

Author: marek-trtik

cbmc/src/goto-programs/remove_virtual_functions.cpp

@@ -475,7 +475,7 @@ void remove_virtual_function(
     goto_program, instruction, dispatch_table, fallback_action);
 }
 
-void get_overridden_functions(
+void get_virtual_function_callees(
   const exprt &function,
   const symbol_tablet &symbol_table,
   const class_hierarchyt &class_hierarchy,

cbmc/src/goto-programs/remove_virtual_functions.h

@@ -73,7 +73,7 @@ void remove_virtual_function(
 /// \param class_hierarchy: A class hierarchy.
 /// \param [out] overridden_functions: Output collection into which all
 ///                                    overridden functions will be stored.
-void get_overridden_functions(
+void get_virtual_function_callees(
   const exprt &function,
   const symbol_tablet &symbol_table,
   const class_hierarchyt &class_hierarchy,

src/taint-analysis/taint_summary.cpp

@@ -1104,7 +1104,7 @@ numbered_lvalue_to_taint_mapt taint_algorithm_computing_summary_of_functiont::
         const code_typet &fn_type =
           program->get_functions().function_map.at(callee_id).type;
         std::vector<irep_idt> overridden_functions;
-        find_overridden_functions(
+        get_virtual_function_callees(
           callee_expr,
           program->get_symbol_table(),
           program->get_class_hierarchy(),

src/util/find_overridden_functions.cpp

@@ -35,21 +35,21 @@ static const irep_idt get_class_name(
 }
 
 
-void find_overridden_functions(
+void get_virtual_function_callees(
   const exprt &function,
   const symbol_tablet &symbol_table,
   const class_hierarchyt &class_hierarchy,
   std::vector<irep_idt> &result)
 {
   const irep_idt &function_id=to_symbol_expr(function).get_identifier();
-  find_overridden_functions(
+  get_virtual_function_callees(
     function_id,
     symbol_table,
     class_hierarchy,
     result);
 }
 
-void find_overridden_functions(
+void get_virtual_function_callees(
   const irep_idt &function_full_name,
   const symbol_tablet &symbol_table,
   const class_hierarchyt &class_hierarchy,
@@ -99,11 +99,11 @@ void find_overridden_functions(
   symbol_exprt function_expr(function_full_name);
   function_expr.set(ID_C_class, root_class_name);
   function_expr.set(ID_component_name, method_name);
-  get_overridden_functions(
+  get_virtual_function_callees(
     function_expr,
     symbol_table,
     class_hierarchy,
     overridden_functions);
   for(const auto &entry : overridden_functions)
-    result.emplace_back("java::" + from_expr(entry.symbol_expr));
+    result.emplace_back(entry.symbol_expr.get_identifier());
 }

src/util/find_overridden_functions.h

@@ -28,7 +28,7 @@
 /// \param symbol_table: A symbol table.
 /// \param class_hierarchy: A class hierarchy.
 /// \param [out] result: Output collection to be filled in by names of overrides.
-void find_overridden_functions(
+void get_virtual_function_callees(
   const exprt &function,
   const symbol_tablet &symbol_table,
   const class_hierarchyt &class_hierarchy,
@@ -42,7 +42,7 @@ void find_overridden_functions(
 /// \param symbol_table: A symbol table.
 /// \param class_hierarchy: A class hierarchy.
 /// \param [out] result: Output collection to be filled in by names of overrides.
-void find_overridden_functions(
+void get_virtual_function_callees(
   const irep_idt &function_full_name,
   const symbol_tablet &symbol_table,
   const class_hierarchyt &class_hierarchy,