Merge pull request diffblue#367 from diffblue/lvsa-global-structs-in-function-summaries

LVSA: cope with global structs in function summaries

Author: owen-jones-diffblue

src/pointer-analysis/local_value_set_analysis.cpp

@@ -491,17 +491,16 @@ void local_value_set_analysist::transform_function_stub(
     }
     else
     {
-      // The only other kind of symbols mentioned
-      // in summary LHS are global variables.
-      INVARIANT(
-        lhs_fieldname.field_name == "",
-        "unexpected lhs entry in call summary assignments");
-      const auto &global_sym = ns.lookup(lhs_fieldname.base_name);
+      // The only other kind of symbols mentioned in summary LHS are global
+      // variables. Global variables defined in the java source cannot be
+      // structs and thus will have an empty string as the field name, but
+      // this is not true for synthetic global variables, such as class models.
       local_value_sett::entryt global_entry_name(
         lhs_fieldname.base_name,
-        "",
+        lhs_fieldname.field_name,
         lhs_fieldname.declared_on_type,
         lhs_fieldname.structured_lhs);
+      const auto &global_sym = ns.lookup(lhs_fieldname.base_name);
       auto &global_entry =
         valuesets.get_entry(global_entry_name, global_sym.type, ns);
       valuesets.make_union(global_entry.object_map, rhs_values);