Follow address-of-static-struct when picking out useful allocated objects.

smowton · smowton · commit 9c22100be9e5 · 2016-08-02T17:31:19.000+01:00
diff --git a/src/test_gen/java_test_source_factory.cpp b/src/test_gen/java_test_source_factory.cpp
@@ -433,8 +433,7 @@ void reference_factoryt::gather_referenced_symbols(const exprt& rhs, inputst& in
 {
   forall_operands(op_iter,rhs)
   {
-    if(op_iter->type().id()==ID_pointer ||
-       (op_iter->type().id()==ID_struct && rhs.id()==ID_address_of))
+    if(op_iter->type().id()==ID_pointer || rhs.id()==ID_address_of)
     {
       symbol_exprt underlying=try_find_underlying_symbol_expr(*op_iter);
       if(underlying!=symbol_exprt())

Original file line number	Diff line number	Diff line change
`@@ -433,8 +433,7 @@ void reference_factoryt::gather_referenced_symbols(const exprt& rhs, inputst& in`
`433`	`433`	`{`
`434`	`434`	`forall_operands(op_iter,rhs)`
`435`	`435`	`{`
`436`		`- if(op_iter->type().id()==ID_pointer \|\|`
`437`		`- (op_iter->type().id()==ID_struct && rhs.id()==ID_address_of))`
	`436`	`+ if(op_iter->type().id()==ID_pointer \|\| rhs.id()==ID_address_of)`
`438`	`437`	`{`
`439`	`438`	`symbol_exprt underlying=try_find_underlying_symbol_expr(*op_iter);`
`440`	`439`	`if(underlying!=symbol_exprt())`