Refactoring: Rename rhs_map to rhs_values

Author: Owen Jones

src/pointer-analysis/local_value_set_analysis.cpp

@@ -414,7 +414,7 @@ void local_value_set_analysist::transform_function_stub(
     const auto &rhs_expr = assignment.second;
     if(pre_call_rhs_value_sets.count(rhs_expr))
       continue;
-    auto &rhs_map = pre_call_rhs_value_sets[rhs_expr];
+    value_sett::object_mapt &rhs_values = pre_call_rhs_value_sets[rhs_expr];
     if(rhs_expr.id() == ID_external_value_set)
     {
       // The RHS expression is an external value set. Expand this to read from
@@ -441,16 +441,16 @@ void local_value_set_analysist::transform_function_stub(
             rhs_entries);
         }
 
-        // Accumulate all possibly-read pointers into `rhs_map`:
+        // Accumulate all possibly-read pointers into `rhs_values`:
         for(const auto &rhs_entry : rhs_entries)
         {
           valuesets.make_union_adjusting_types(
-            rhs_map, rhs_entry->object_map, evse.type(), ns);
+            rhs_values, rhs_entry->object_map, evse.type(), ns);
         }
         // Also add the external set itself,
         // representing the possibility that the read
         // comes from outside *this* function as well:
-        valuesets.insert(rhs_map, evse);
+        valuesets.insert(rhs_values, evse);
       }
       else if(has_prefix(evse_label, PRECISE_EVS_PREFIX))
       {
@@ -459,7 +459,8 @@ void local_value_set_analysist::transform_function_stub(
         exprt precise_access_path_expr =
           get_expr_from_precise_evs(evse, function_symbol, fcall, ns, *this);
 
-        valuesets.get_value_set(precise_access_path_expr, rhs_map, ns, false);
+        valuesets.get_value_set(
+          precise_access_path_expr, rhs_values, ns, false);
       }
       else
       {
@@ -470,7 +471,7 @@ void local_value_set_analysist::transform_function_stub(
         exprt root_object_expr = get_expr_from_root_object_evs(
           evse, function_symbol, fcall, ns, *this);
 
-        valuesets.get_value_set(root_object_expr, rhs_map, ns, false);
+        valuesets.get_value_set(root_object_expr, rhs_values, ns, false);
       }
     }
     else
@@ -485,7 +486,7 @@ void local_value_set_analysist::transform_function_stub(
         valuesets.demote_most_recent_dynamic_objects(loc_number);
       }
 
-      valuesets.insert(rhs_map, rhs_expr);
+      valuesets.insert(rhs_values, rhs_expr);
     }
   }