Merge pull request diffblue#452 from diffblue/HACK_avoiding_invariant_failure_due_to_inconsitency_in_goto

SEC-450: HACK: Avoiding invariant failure due to inconsitency in GOTO program.

Author: marek-trtik

src/taint-slicer/instrumenter.cpp

@@ -368,6 +368,14 @@ exprt taint_instrumentert::drive_access_path_through_super_classes(
       fixed_struct_type=to_struct_type(
         get_instrumented_symbol_table().lookup_ref(member_type_name).type);
     }
+    // The following 'if' statement is a HACK. It is a temporary hot-fix for
+    // inconsistency between the symbol table and GOTO instructions, when
+    // translating generics; see SEC-450 for more details.
+    if(member_expr->get_component_name() == "@java.lang.Object" &&
+      fixed_struct_type.get_tag() == "java.lang.Object")
+    {
+      return fixed_compound;
+    }
     INVARIANT(fixed_struct_type.has_component(
       member_expr->get_component_name()),
       "The member must exist now (either the original or the super variable).");