Use goto_programt::loop_id

This ensures we build loop identifiers in the same way everywhere.

Author: tautschnig

src/goto-instrument/unwind.cpp

@@ -281,8 +281,7 @@ void goto_unwindt::unwind(
     const irep_idt func=i_it->function;
     assert(!func.empty());
 
-    const irep_idt loop_id=
-      id2string(func) + "." + std::to_string(i_it->loop_number);
+    const irep_idt loop_id = goto_programt::loop_id(func, *i_it);
 
     auto limit=unwindset.get_limit(loop_id, 0);
 

src/goto-programs/loop_ids.cpp

@@ -36,9 +36,7 @@ void show_loop_ids(
       {
         if(it->is_backwards_goto())
         {
-          unsigned loop_id=it->loop_number;
-
-          std::cout << "Loop " << function_identifier << "." << loop_id << ":"
+          std::cout << "Loop " << goto_programt::loop_id(function_identifier, *it) << ":"
                     << "\n";
 
           std::cout << "  " << it->source_location << "\n";
@@ -53,9 +51,7 @@ void show_loop_ids(
       {
         if(it->is_backwards_goto())
         {
-          unsigned loop_id=it->loop_number;
-          std::string id =
-            id2string(function_identifier) + "." + std::to_string(loop_id);
+          std::string id = id2string(goto_programt::loop_id(function_identifier, *it));
 
           xmlt xml_loop("loop", {{"name", id}}, {});
           xml_loop.new_element("loop-id").data=id;
@@ -82,9 +78,7 @@ void show_loop_ids_json(
   {
     if(it->is_backwards_goto())
     {
-      unsigned loop_id=it->loop_number;
-      std::string id =
-        id2string(function_identifier) + "." + std::to_string(loop_id);
+      std::string id = id2string(goto_programt::loop_id(function_identifier, *it));
 
       loops.push_back(
         json_objectt({{"name", json_stringt(id)},