Use auto to declare iterators in goto_convertt::finish_goto

thomasspriggs · thomasspriggs · commit 747bb636b017 · 2023-12-05T19:44:13.000Z
diff --git a/src/goto-programs/goto_convert.cpp b/src/goto-programs/goto_convert.cpp
@@ -251,9 +251,7 @@ void goto_convertt::finish_gotos(goto_programt &dest, const irep_idt &mode)
     if(i.is_start_thread())
     {
       const irep_idt &goto_label = i.code().get(ID_destination);
-
-      labelst::const_iterator l_it=
-        targets.labels.find(goto_label);
+      const auto l_it = targets.labels.find(goto_label);
 
       if(l_it == targets.labels.end())
       {
@@ -267,8 +265,7 @@ void goto_convertt::finish_gotos(goto_programt &dest, const irep_idt &mode)
     else if(i.is_incomplete_goto())
     {
       const irep_idt &goto_label = i.code().get(ID_destination);
-
-      labelst::const_iterator l_it=targets.labels.find(goto_label);
+      const auto l_it = targets.labels.find(goto_label);
 
       if(l_it == targets.labels.end())
       {

Original file line number	Diff line number	Diff line change
`@@ -251,9 +251,7 @@ void goto_convertt::finish_gotos(goto_programt &dest, const irep_idt &mode)`
`251`	`251`	`if(i.is_start_thread())`
`252`	`252`	`{`
`253`	`253`	`const irep_idt &goto_label = i.code().get(ID_destination);`
`254`		`-`
`255`		`- labelst::const_iterator l_it=`
`256`		`- targets.labels.find(goto_label);`
	`254`	`+ const auto l_it = targets.labels.find(goto_label);`
`257`	`255`
`258`	`256`	`if(l_it == targets.labels.end())`
`259`	`257`	`{`
`@@ -267,8 +265,7 @@ void goto_convertt::finish_gotos(goto_programt &dest, const irep_idt &mode)`
`267`	`265`	`else if(i.is_incomplete_goto())`
`268`	`266`	`{`
`269`	`267`	`const irep_idt &goto_label = i.code().get(ID_destination);`
`270`		`-`
`271`		`- labelst::const_iterator l_it=targets.labels.find(goto_label);`
	`268`	`+ const auto l_it = targets.labels.find(goto_label);`
`272`	`269`
`273`	`270`	`if(l_it == targets.labels.end())`
`274`	`271`	`{`