Removal of original most-recent-alloc record from the valuest map.

This also fixes one of the the xfail benchmarks.

Author: marek-trtik

regression/LVSA/recent_alloc_clear_from_callees/Test.java

@@ -105,7 +105,7 @@ public static void should_be_most_recent_A_3() {
         output = e;
     }
 
-    public static void should_be_and_should_not_be_most_recent_A_4() {
+    public static void should_be_most_recent_A_4() {
         A d = getA(getData());
         A e = getA(getData());
         output = e.data;

regression/LVSA/recent_alloc_clear_from_callees/test_recent_alloc_clear_from_callees.py

@@ -142,19 +142,17 @@ def test_should_be_most_recent_A_3(tmpdir):
     value_set_expectation.check_contains_dynamic_object(1, True)
 
 
-@pytest.mark.xfail
-def test_should_be_and_should_not_be_most_recent_A_4(tmpdir):
+def test_should_be_most_recent_A_4(tmpdir):
     """
     [11] Checks whether 'is_most_recent_allocation' flag is cleared when
     receiving DOs from callees.
     """
     with utils.working_dir(_get_this_file_dir()):
         os.system("javac Test.java")
-    lvsa_driver = driver.LvsaDriver(tmpdir, _get_folder_name()).with_test_function('should_be_and_should_not_be_most_recent_A_4')
+    lvsa_driver = driver.LvsaDriver(tmpdir, _get_folder_name()).with_test_function('should_be_most_recent_A_4')
     lvsa_expectation = lvsa_driver.run()
     value_set_expectation = lvsa_expectation.get_value_set_for_output()
     value_set_expectation.check_contains_dynamic_object(1, True)
-    value_set_expectation.check_contains_dynamic_object(0, False)
 
 
 def test_should_not_be_most_recent_caller_1(tmpdir):

src/pointer-analysis/local_value_set_analysis.cpp

@@ -319,11 +319,10 @@ void local_value_set_analysist::transform_function_stub(
         const typet &dynamic_type=
           static_cast<const typet &>(rhs_expr.find(ID_C_cxx_alloc_type));
 
-        // Iterates over the domain's entries and when we find the current
-        // most-recent-allocation dynamic-object, add its object-map
-        // to its correspondent any-allocation dynamic-object's object-map
-        for(auto &value : valuesets.values)
+        std::vector<local_value_sett::valuest::iterator> to_remove;
+        for(auto it=valuesets.values.begin(); it!=valuesets.values.end(); ++it)
         {
+          auto &value=*it;
           local_value_sett::entryt &entry=value.second;
 
           if(entry.identifier==name_most_recent)
@@ -333,8 +332,11 @@ void local_value_set_analysist::transform_function_stub(
               dynamic_type,
               ns);
             valuesets.make_union(entry_any_allocation.object_map, entry.object_map);
+            to_remove.push_back(it);
           }
         }
+        for(auto it : to_remove)
+          valuesets.values.erase(it);
       }
 
       valuesets.insert(rhs_map, rhs_expr);