properly set function id on instructions added by remove_asm

Author: Daniel Kroening

src/analyses/flow_insensitive_analysis.cpp

@@ -240,6 +240,9 @@ bool flow_insensitive_analysis_baset::do_function_call(
     // get the state at the beginning of the function
     locationt l_begin=goto_function.body.instructions.begin();
 
+    DATA_INVARIANT(l_begin->function == f_it->first,
+                   "function names have to match");
+
     // do the edge from the call site to the beginning of the function
     new_data=state.transform(ns, l_call, l_begin);
 

src/goto-programs/remove_asm.cpp

@@ -467,6 +467,9 @@ void remove_asmt::process_function(
       it->make_skip();
       did_something = true;
 
+      for(auto & instruction : tmp_dest.instructions)
+        instruction.function = it->function;
+
       goto_programt::targett next=it;
       next++;