fixes

Author: danpoe

regression/goto-instrument-unwind/unwind-chain.sh

@@ -18,6 +18,7 @@ fi
 name=$(echo $2 | cut -d. -f1)
 
 $goto_cc -o $name.gb $name.c
+$goto_instrument --show-goto-functions $name.gb
 $goto_instrument $1 $name.gb ${name}-unwound.gb
 $goto_instrument --show-goto-functions ${name}-unwound.gb
 $cbmc ${name}-unwound.gb

src/goto-instrument/unwind.cpp

@@ -176,10 +176,12 @@ void goto_unwindt::unwind(
   if(unwind_strategy==PARTIAL)
   {
     goto_programt::targett t=rest_program.add_instruction();
+    unwind_log.insert(t, loop_head->location_number);
+
     t->make_skip();
     t->source_location=loop_head->source_location;
     t->function=loop_head->function;
-    unwind_log.insert(t, loop_head->location_number);
+    t->location_number=loop_head->location_number;
   }
   else if(unwind_strategy==REST)
   {
@@ -216,6 +218,7 @@ void goto_unwindt::unwind(
 
     new_t->source_location=loop_head->source_location;
     new_t->function=loop_head->function;
+    new_t->location_number=loop_head->location_number;
     unwind_log.insert(new_t, loop_head->location_number);
   }
 
@@ -242,6 +245,7 @@ void goto_unwindt::unwind(
       t_goto->source_location=loop_exit->source_location;
       t_goto->function=loop_exit->function;
       t_goto->guard=true_exprt();
+      t_goto->location_number=loop_exit->location_number;
     }
 
     // add a skip before the loop exit
@@ -252,6 +256,7 @@ void goto_unwindt::unwind(
     t_skip->make_skip();
     t_skip->source_location=loop_head->source_location;
     t_skip->function=loop_head->function;
+    t_skip->location_number=loop_head->location_number;
 
     // where to go for the next iteration
     goto_programt::targett loop_iter=t_skip;
@@ -293,6 +298,7 @@ void goto_unwindt::unwind(
     t_skip->make_skip();
     t_skip->source_location=loop_head->source_location;
     t_skip->function=loop_head->function;
+    t_skip->location_number=loop_head->location_number;
 
     // redirect gotos into loop body
     Forall_goto_program_instructions(i_it, goto_program)