Fix simpilar issues in other places in pointer-analysis.

It seems that there is a spurious loop over all instructions.
I suspect this is a copy and paste error from location sensitive code.

Author: martin

src/pointer-analysis/value_set_analysis_fivr.cpp

@@ -84,33 +84,26 @@ void value_set_analysis_fivrt::add_vars(
   entry_cachet entry_cache;
 
   value_set_fivrt &v=state.value_set;
+  v.add_vars(globals);
 
-  for(goto_programt::instructionst::const_iterator
-      i_it=goto_program.instructions.begin();
-      i_it!=goto_program.instructions.end();
-      i_it++)
+  for(goto_programt::decl_identifierst::const_iterator
+      l_it=locals.begin();
+      l_it!=locals.end();
+      l_it++)
   {
-    v.add_vars(globals);
+    // cache hit?
+    entry_cachet::const_iterator e_it=entry_cache.find(*l_it);
 
-    for(goto_programt::decl_identifierst::const_iterator
-        l_it=locals.begin();
-        l_it!=locals.end();
-        l_it++)
+    if(e_it==entry_cache.end())
     {
-      // cache hit?
-      entry_cachet::const_iterator e_it=entry_cache.find(*l_it);
+      const symbolt &symbol=ns.lookup(*l_it);
 
-      if(e_it==entry_cache.end())
-      {
-        const symbolt &symbol=ns.lookup(*l_it);
-
-        std::list<value_set_fivrt::entryt> &entries=entry_cache[*l_it];
-        get_entries(symbol, entries);
-        v.add_vars(entries);
-      }
-      else
-        v.add_vars(e_it->second);
+      std::list<value_set_fivrt::entryt> &entries=entry_cache[*l_it];
+      get_entries(symbol, entries);
+      v.add_vars(entries);
     }
+    else
+      v.add_vars(e_it->second);
   }
 }
 
@@ -202,6 +195,7 @@ void value_set_analysis_fivrt::add_vars(
   get_globals(globals);
 
   value_set_fivrt &v=state.value_set;
+  v.add_vars(globals);
 
   for(goto_functionst::function_mapt::const_iterator
       f_it=goto_functions.function_map.begin();
@@ -212,21 +206,16 @@ void value_set_analysis_fivrt::add_vars(
     std::set<irep_idt> locals;
     get_local_identifiers(f_it->second, locals);
 
-    forall_goto_program_instructions(i_it, f_it->second.body)
+    for(std::set<irep_idt>::const_iterator
+        l_it=locals.begin();
+        l_it!=locals.end();
+        l_it++)
     {
-      v.add_vars(globals);
+      const symbolt &symbol=ns.lookup(*l_it);
 
-      for(std::set<irep_idt>::const_iterator
-          l_it=locals.begin();
-          l_it!=locals.end();
-          l_it++)
-      {
-        const symbolt &symbol=ns.lookup(*l_it);
-
-        std::list<value_set_fivrt::entryt> entries;
-        get_entries(symbol, entries);
-        v.add_vars(entries);
-      }
+      std::list<value_set_fivrt::entryt> entries;
+      get_entries(symbol, entries);
+      v.add_vars(entries);
     }
   }
 }

src/pointer-analysis/value_set_analysis_fivrns.cpp

@@ -84,33 +84,26 @@ void value_set_analysis_fivrnst::add_vars(
   entry_cachet entry_cache;
 
   value_set_fivrnst &v=state.value_set;
+  v.add_vars(globals);
 
-  for(goto_programt::instructionst::const_iterator
-      i_it=goto_program.instructions.begin();
-      i_it!=goto_program.instructions.end();
-      i_it++)
+  for(goto_programt::decl_identifierst::const_iterator
+      l_it=locals.begin();
+      l_it!=locals.end();
+      l_it++)
   {
-    v.add_vars(globals);
+    // cache hit?
+    entry_cachet::const_iterator e_it=entry_cache.find(*l_it);
 
-    for(goto_programt::decl_identifierst::const_iterator
-        l_it=locals.begin();
-        l_it!=locals.end();
-        l_it++)
+    if(e_it==entry_cache.end())
     {
-      // cache hit?
-      entry_cachet::const_iterator e_it=entry_cache.find(*l_it);
+      const symbolt &symbol=ns.lookup(*l_it);
 
-      if(e_it==entry_cache.end())
-      {
-        const symbolt &symbol=ns.lookup(*l_it);
-
-        std::list<value_set_fivrnst::entryt> &entries=entry_cache[*l_it];
-        get_entries(symbol, entries);
-        v.add_vars(entries);
-      }
-      else
-        v.add_vars(e_it->second);
+      std::list<value_set_fivrnst::entryt> &entries=entry_cache[*l_it];
+      get_entries(symbol, entries);
+      v.add_vars(entries);
     }
+    else
+      v.add_vars(e_it->second);
   }
 }
 
@@ -202,6 +195,7 @@ void value_set_analysis_fivrnst::add_vars(
   get_globals(globals);
 
   value_set_fivrnst &v=state.value_set;
+  v.add_vars(globals);
 
   for(goto_functionst::function_mapt::const_iterator
       f_it=goto_functions.function_map.begin();
@@ -212,21 +206,16 @@ void value_set_analysis_fivrnst::add_vars(
     std::set<irep_idt> locals;
     get_local_identifiers(f_it->second, locals);
 
-    forall_goto_program_instructions(i_it, f_it->second.body)
+    for(std::set<irep_idt>::const_iterator
+        l_it=locals.begin();
+        l_it!=locals.end();
+        l_it++)
     {
-      v.add_vars(globals);
+      const symbolt &symbol=ns.lookup(*l_it);
 
-      for(std::set<irep_idt>::const_iterator
-          l_it=locals.begin();
-          l_it!=locals.end();
-          l_it++)
-      {
-        const symbolt &symbol=ns.lookup(*l_it);
-
-        std::list<value_set_fivrnst::entryt> entries;
-        get_entries(symbol, entries);
-        v.add_vars(entries);
-      }
+      std::list<value_set_fivrnst::entryt> entries;
+      get_entries(symbol, entries);
+      v.add_vars(entries);
     }
   }
 }