Clean up get_function_id hacks

Author: peterschrammel

src/analyses/dependence_graph.cpp

@@ -76,7 +76,7 @@ void dep_graph_domaint::control_dependencies(
      from->is_assume())
     control_deps.insert(from);
 
-  const irep_idt id=goto_programt::get_function_id(from);
+  const irep_idt id=from->function;
   const cfg_post_dominatorst &pd=dep_graph.cfg_post_dominators().at(id);
 
   // check all candidates for M

src/goto-instrument/full_slicer.cpp

@@ -150,7 +150,7 @@ void full_slicert::add_jumps(
       continue;
     }
 
-    const irep_idt id=goto_programt::get_function_id(j.PC);
+    const irep_idt id=j.PC->function;
     const cfg_post_dominatorst &pd=post_dominators.at(id);
 
     cfg_post_dominatorst::cfgt::entry_mapt::const_iterator e=
@@ -184,7 +184,7 @@ void full_slicert::add_jumps(
 
         if(cfg[entry->second].node_required)
         {
-          const irep_idt id2=goto_programt::get_function_id(*d_it);
+          const irep_idt id2=(*d_it)->function;
           INVARIANT(id==id2,
                     "goto/jump expected to be within a single function");
 

src/goto-programs/goto_program_template.h

@@ -386,21 +386,12 @@ class goto_program_templatet
     return t;
   }
 
-  static const irep_idt get_function_id(
-    const_targett l)
-  {
-    while(!l->is_end_function())
-      ++l;
-
-    return l->function;
-  }
-
   static const irep_idt get_function_id(
     const goto_program_templatet<codeT, guardT> &p)
   {
-    assert(!p.empty());
+    PRECONDITION(!p.empty());
 
-    return get_function_id(--p.instructions.end());
+    return p.instructions.back().function;
   }
 
   template <typename Target>

src/goto-programs/remove_returns.cpp

@@ -244,8 +244,7 @@ void remove_returnst::operator()(
   if(goto_function.body.empty())
     return;
 
-  replace_returns(
-    goto_programt::get_function_id(goto_function.body), goto_function);
+  replace_returns(model_function.get_function_id(), goto_function);
   do_function_calls(function_is_stub, goto_function.body);
 }