Inline two small functions that are only used in one place

Author: martin-cs

src/analyses/variable-sensitivity/variable_sensitivity_domain.cpp

@@ -275,13 +275,6 @@ bool variable_sensitivity_domaint::is_top() const
   return abstract_state.is_top();
 }
 
-std::vector<irep_idt> variable_sensitivity_domaint::get_modified_symbols(
-  const variable_sensitivity_domaint &other) const
-{
-  return abstract_environmentt::modified_symbols(
-    abstract_state, other.abstract_state);
-}
-
 void variable_sensitivity_domaint::transform_function_call(
   locationt from,
   locationt to,
@@ -439,7 +432,8 @@ void variable_sensitivity_domaint::merge_three_way_function_return(
     static_cast<const variable_sensitivity_domaint &>(function_end);
 
   const std::vector<irep_idt> &modified_symbol_names =
-    cast_function_start.get_modified_symbols(cast_function_end);
+    abstract_environmentt::modified_symbols(
+      cast_function_start.abstract_state, cast_function_end.abstract_state);
 
   std::vector<symbol_exprt> modified_symbols;
   modified_symbols.reserve(modified_symbol_names.size());
@@ -450,21 +444,14 @@ void variable_sensitivity_domaint::merge_three_way_function_return(
     [&ns](const irep_idt &id) { return ns.lookup(id).symbol_expr(); });
 
   abstract_state = cast_function_call.abstract_state;
-  apply_domain(modified_symbols, cast_function_end, ns);
-
-  return;
-}
-
-void variable_sensitivity_domaint::apply_domain(
-  std::vector<symbol_exprt> modified_symbols,
-  const variable_sensitivity_domaint &source,
-  const namespacet &ns)
-{
   for(const auto &symbol : modified_symbols)
   {
-    abstract_object_pointert value = source.abstract_state.eval(symbol, ns);
+    abstract_object_pointert value =
+      cast_function_end.abstract_state.eval(symbol, ns);
     abstract_state.assign(symbol, value, ns);
   }
+
+  return;
 }
 
 void variable_sensitivity_domaint::assume(exprt expr, namespacet ns)

src/analyses/variable-sensitivity/variable_sensitivity_domain.h

@@ -241,22 +241,6 @@ class variable_sensitivity_domaint : public ai_domain_baset
   /// \return Returns true if the function should be ignored
   bool ignore_function_call_transform(const irep_idt &function_id) const;
 
-  /// Get symbols that have been modified since this domain and other
-  /// \param other: The domain that things may have been modified in
-  /// \return A list of symbols whose write location is different
-  std::vector<irep_idt>
-  get_modified_symbols(const variable_sensitivity_domaint &other) const;
-
-  /// Given a domain and some symbols, apply those symbols values
-  /// to the current domain
-  /// \param modified_symbols: The symbols to write
-  /// \param target: The domain to take the values from
-  /// \param ns: The global namespace
-  void apply_domain(
-    std::vector<symbol_exprt> modified_symbols,
-    const variable_sensitivity_domaint &target,
-    const namespacet &ns);
-
   void assume(exprt expr, namespacet ns);
 
   abstract_environmentt abstract_state;