Reflecting changes in numbering; uses of 'object_map.find'; use of '@pytest.mark.xfail(strict=True)'

Author: marek-trtik

regression/LVSA/recent_alloc_clear_from_callees/test_recent_alloc_clear_from_callees.py

@@ -168,7 +168,7 @@ def test_should_not_be_most_recent_caller_1(tmpdir):
     value_set_expectation.check_contains_dynamic_object(1, False)
 
 
-@pytest.mark.xfail
+@pytest.mark.xfail(strict=True)
 def test_should_not_be_most_recent_caller_2(tmpdir):
     """
     [13] Checks whether 'is_most_recent_allocation' flag is cleared when

src/pointer-analysis/local_value_set_analysis.cpp

@@ -266,10 +266,11 @@ void local_value_set_analysist::transform_function_stub(
     {
       // Ordinary value set member (not an external value set);
 
-      object_numberingt::number_type rhs_num;
+      const auto rhs_num=valuesets.object_numbering.get_number(rhs_expr);
+      //object_numberingt::number_type rhs_num;
       if(can_cast_expr<dynamic_object_exprt>(rhs_expr) &&
         l_call->location_number==valuesets.location_number &&
-        !valuesets.object_numbering.get_number(rhs_expr, rhs_num))
+        rhs_num)
       {
         // Replace all the current most-recent-allocation dynamic-objects
         // with the corresponding any-allocation ones
@@ -280,10 +281,7 @@ void local_value_set_analysist::transform_function_stub(
 
           // Look-up for the first appearance of the current
           // most-recent dynamic-object in the current object-map
-          auto it=object_map.begin();
-          for(; it!=object_map.end(); ++it)
-            if(it->first==rhs_num)
-              break;
+          const auto it=object_map.find(*rhs_num);
           if(it==object_map.end())
             continue;