Update regression tests to cope with changes to initialisation

martin · martin · commit edbdc4fb9ccd · 2020-11-10T11:24:03.000Z
A recent PR has removed a couple of the in-built global
variables that are used for modelling the C standard library.
This has a knock on effect for the line numbers in the tests
of dependency graphs.
diff --git a/regression/goto-analyzer/constant_propagation_01/test-vsd.desc b/regression/goto-analyzer/constant_propagation_01/test-vsd.desc
@@ -3,7 +3,7 @@ main.c
 --variable-sensitivity --simplify out.gb
 ^EXIT=0$
 ^SIGNAL=0$
-^Simplified:  assert: 1, assume: 0, goto: 1, assigns: 8, function calls: 0$
-^Unmodified:  assert: 0, assume: 0, goto: 0, assigns: 18, function calls: 2$
+^Simplified:  assert: 1, assume: 0, goto: 1, assigns: 7, function calls: 0$
+^Unmodified:  assert: 0, assume: 0, goto: 0, assigns: 17, function calls: 2$
 --
 ^warning: ignoring
diff --git a/regression/goto-analyzer/constant_propagation_02/test-vsd.desc b/regression/goto-analyzer/constant_propagation_02/test-vsd.desc
@@ -3,7 +3,7 @@ main.c
 --variable-sensitivity --simplify out.gb
 ^EXIT=0$
 ^SIGNAL=0$
-^Simplified:  assert: 1, assume: 0, goto: 1, assigns: 9, function calls: 0$
-^Unmodified:  assert: 0, assume: 0, goto: 0, assigns: 17, function calls: 2$
+^Simplified:  assert: 1, assume: 0, goto: 1, assigns: 8, function calls: 0$
+^Unmodified:  assert: 0, assume: 0, goto: 0, assigns: 16, function calls: 2$
 --
 ^warning: ignoring
diff --git a/regression/goto-analyzer/constant_propagation_03/test-vsd.desc b/regression/goto-analyzer/constant_propagation_03/test-vsd.desc
@@ -3,7 +3,7 @@ main.c
 --variable-sensitivity --simplify out.gb
 ^EXIT=0$
 ^SIGNAL=0$
-^Simplified:  assert: 1, assume: 0, goto: 1, assigns: 9, function calls: 0$
-^Unmodified:  assert: 0, assume: 0, goto: 0, assigns: 17, function calls: 2$
+^Simplified:  assert: 1, assume: 0, goto: 1, assigns: 8, function calls: 0$
+^Unmodified:  assert: 0, assume: 0, goto: 0, assigns: 16, function calls: 2$
 --
 ^warning: ignoring
diff --git a/regression/goto-analyzer/constant_propagation_04/test-vsd.desc b/regression/goto-analyzer/constant_propagation_04/test-vsd.desc
@@ -3,7 +3,7 @@ main.c
 --variable-sensitivity --simplify out.gb
 ^EXIT=0$
 ^SIGNAL=0$
-^Simplified:  assert: 1, assume: 0, goto: 1, assigns: 9, function calls: 0$
-^Unmodified:  assert: 0, assume: 0, goto: 0, assigns: 17, function calls: 2$
+^Simplified:  assert: 1, assume: 0, goto: 1, assigns: 8, function calls: 0$
+^Unmodified:  assert: 0, assume: 0, goto: 0, assigns: 16, function calls: 2$
 --
 ^warning: ignoring
diff --git a/regression/goto-analyzer/constant_propagation_07/test-vsd.desc b/regression/goto-analyzer/constant_propagation_07/test-vsd.desc
@@ -3,7 +3,7 @@ main.c
 --variable-sensitivity --simplify out.gb
 ^EXIT=0$
 ^SIGNAL=0$
-^Simplified:  assert: 1, assume: 0, goto: 3, assigns: 10, function calls: 0$
-^Unmodified:  assert: 0, assume: 0, goto: 1, assigns: 19, function calls: 2$
+^Simplified:  assert: 1, assume: 0, goto: 3, assigns: 9, function calls: 0$
+^Unmodified:  assert: 0, assume: 0, goto: 1, assigns: 18, function calls: 2$
 --
 ^warning: ignoring
diff --git a/regression/goto-analyzer/constant_propagation_08/test-vsd.desc b/regression/goto-analyzer/constant_propagation_08/test-vsd.desc
@@ -3,7 +3,7 @@ main.c
 --variable-sensitivity --vsd-arrays --simplify out.gb
 ^EXIT=0$
 ^SIGNAL=0$
-^Simplified:  assert: 1, assume: 0, goto: 2, assigns: 9, function calls: 0$
-^Unmodified:  assert: 0, assume: 0, goto: 3, assigns: 18, function calls: 2$
+^Simplified:  assert: 1, assume: 0, goto: 2, assigns: 8, function calls: 0$
+^Unmodified:  assert: 0, assume: 0, goto: 3, assigns: 17, function calls: 2$
 --
 ^warning: ignoring
diff --git a/regression/goto-analyzer/constant_propagation_11/test-vsd.desc b/regression/goto-analyzer/constant_propagation_11/test-vsd.desc
@@ -3,7 +3,7 @@ main.c
 --variable-sensitivity --vsd-arrays --simplify out.gb
 ^EXIT=0$
 ^SIGNAL=0$
-^Simplified:  assert: 1, assume: 0, goto: 1, assigns: 9, function calls: 0$
-^Unmodified:  assert: 0, assume: 0, goto: 1, assigns: 15, function calls: 2$
+^Simplified:  assert: 1, assume: 0, goto: 1, assigns: 8, function calls: 0$
+^Unmodified:  assert: 0, assume: 0, goto: 1, assigns: 14, function calls: 2$
 --
 ^warning: ignoring
diff --git a/regression/goto-analyzer/constant_propagation_11/test.desc b/regression/goto-analyzer/constant_propagation_11/test.desc
@@ -3,7 +3,7 @@ main.c
 --constants --simplify out.gb
 ^EXIT=0$
 ^SIGNAL=0$
-^Simplified:  assert: 1, assume: 0, goto: 1, assigns: 9, function calls: 0$
-^Unmodified:  assert: 0, assume: 0, goto: 1, assigns: 15, function calls: 2$
+^Simplified:  assert: 1, assume: 0, goto: 1, assigns: 8, function calls: 0$
+^Unmodified:  assert: 0, assume: 0, goto: 1, assigns: 14, function calls: 2$
 --
 ^warning: ignoring
diff --git a/regression/goto-analyzer/constant_propagation_12/test-vsd.desc b/regression/goto-analyzer/constant_propagation_12/test-vsd.desc
@@ -3,7 +3,7 @@ main.c
 --variable-sensitivity --simplify out.gb
 ^EXIT=0$
 ^SIGNAL=0$
-^Simplified:  assert: 1, assume: 0, goto: 1, assigns: 8, function calls: 0$
-^Unmodified:  assert: 0, assume: 0, goto: 1, assigns: 16, function calls: 2$
+^Simplified:  assert: 1, assume: 0, goto: 1, assigns: 7, function calls: 0$
+^Unmodified:  assert: 0, assume: 0, goto: 1, assigns: 15, function calls: 2$
 --
 ^warning: ignoring
diff --git a/regression/goto-analyzer/sensitivity-last-written-locations-arrays/test.desc b/regression/goto-analyzer/sensitivity-last-written-locations-arrays/test.desc
@@ -8,31 +8,31 @@ activate-multi-line-match
 main#return_value \(\) -> TOP @ \[1\]
 __CPROVER_dead_object \(\) -> TOP @ \[5\]
 __CPROVER_deallocated \(\) -> TOP @ \[6\]
-__CPROVER_malloc_is_new_array \(\) -> FALSE @ \[10\]
-__CPROVER_malloc_object \(\) -> TOP @ \[12\]
-__CPROVER_malloc_size \(\) -> 0ull? @ \[13\]
-__CPROVER_memory_leak \(\) -> TOP @ \[15\]
-__CPROVER_next_thread_id \(\) -> 0ul @ \[16\]
-__CPROVER_pipe_count \(\) -> 0u @ \[18\]
-__CPROVER_rounding_mode \(\) -> 0 @ \[19\]
-__CPROVER_thread_id \(\) -> 0ul @ \[20\]
-__CPROVER_threads_exited \(\) -> TOP @ \[23\]
-do_arrays::1::bool_ \(\) -> TOP @ \[25\]
-do_arrays::1::bool_1 \(\) -> TOP @ \[26\]
-do_arrays::1::bool_2 \(\) -> TOP @ \[27\]
-do_arrays::1::x \(\) -> \{\[0\] = 10 @ \[29\]\n\} @ \[29\]
-do_arrays::1::x \(\) -> \{\[0\] = 10 @ \[29\]\n\[1\] = 20 @ \[30\]\n\} @ \[30\]
-do_arrays::1::x \(\) -> \{\[0\] = 30 @ \[31\]\n\[1\] = 20 @ \[30\]\n\} @ \[31\]
-do_arrays::1::x \(\) -> \{\[0\] = 30 @ \[31\]\n\[1\] = 40 @ \[32\]\n\} @ \[32\]
-do_arrays::1::x \(\) -> \{\[0\] = 30 @ \[31\]\n\[1\] = 30 @ \[33\]\n\} @ \[33\]
-do_arrays::1::x \(\) -> \{\[0\] = 30 @ \[34\]\n\[1\] = 30 @ \[33\]\n\} @ \[34\]
-do_arrays::1::x \(\) -> \{\[0\] = 5 @ \[35\]\n\[1\] = 30 @ \[33\]\n\} @ \[35\]
-do_arrays::1::x \(\) -> \{\[0\] = 15 @ \[36\]\n\[1\] = 30 @ \[33\]\n\} @ \[36\]
-do_arrays::1::x \(\) -> \{\[0\] = 15 @ \[36\]\n\[1\] = 10 @ \[37\]\n\} @ \[37\]
-do_arrays::1::x \(\) -> \{\[0\] = 20 @ \[39\]\n\[1\] = 10 @ \[37\]\n\} @ \[39\]
-do_arrays::1::x \(\) -> \{\[0\] = 20 @ \[39\, 41\]\n\[1\] = 10 @ \[37\]\n\} @ \[39\, 41\]
-do_arrays::1::x \(\) -> \{\[0\] = 0 @ \[43]\n\[1\] = 10 @ \[37\]\n\} @ \[43\]
-do_arrays::1::x \(\) -> \{\[0\] = 3 @ \[45]\n\[1\] = 10 @ \[37\]\n\} @ \[45\]
-do_arrays::1::x \(\) -> \{\[0\] = TOP @ \[45\, 47]\n\[1\] = 10 @ \[37\]\n\} @ \[45\, 47\]
-do_arrays::1::x \(\) -> \{\[0\] = TOP @ \[45\, 47\, 50]\n\[1\] = 10 @ \[52\]\n\} @ \[52\]
-do_arrays::1::x \(\) -> \{\[0\] = 20 @ \[53]\n\[1\] = 10 @ \[52\]\n\} @ \[53\]
+__CPROVER_malloc_is_new_array \(\) -> FALSE @ \[9\]
+__CPROVER_malloc_object \(\) -> TOP @ \[10\]
+__CPROVER_malloc_size \(\) -> 0ull? @ \[11\]
+__CPROVER_memory_leak \(\) -> TOP @ \[13\]
+__CPROVER_next_thread_key \(\) -> 0ul @ \[15\]
+__CPROVER_pipe_count \(\) -> 0u @ \[16\]
+__CPROVER_rounding_mode \(\) -> 0 @ \[17\]
+__CPROVER_thread_id \(\) -> 0ul @ \[18\]
+__CPROVER_threads_exited \(\) -> TOP @ \[21\]
+do_arrays::1::bool_ \(\) -> TOP @ \[23\]
+do_arrays::1::bool_1 \(\) -> TOP @ \[24\]
+do_arrays::1::bool_2 \(\) -> TOP @ \[25\]
+do_arrays::1::x \(\) -> \{\[0\] = 10 @ \[27\]\n\} @ \[27\]
+do_arrays::1::x \(\) -> \{\[0\] = 10 @ \[27\]\n\[1\] = 20 @ \[28\]\n\} @ \[28\]
+do_arrays::1::x \(\) -> \{\[0\] = 30 @ \[29\]\n\[1\] = 20 @ \[28\]\n\} @ \[29\]
+do_arrays::1::x \(\) -> \{\[0\] = 30 @ \[29\]\n\[1\] = 40 @ \[30\]\n\} @ \[30\]
+do_arrays::1::x \(\) -> \{\[0\] = 30 @ \[29\]\n\[1\] = 30 @ \[31\]\n\} @ \[31\]
+do_arrays::1::x \(\) -> \{\[0\] = 30 @ \[32\]\n\[1\] = 30 @ \[31\]\n\} @ \[32\]
+do_arrays::1::x \(\) -> \{\[0\] = 5 @ \[33\]\n\[1\] = 30 @ \[31\]\n\} @ \[33\]
+do_arrays::1::x \(\) -> \{\[0\] = 15 @ \[34\]\n\[1\] = 30 @ \[31\]\n\} @ \[34\]
+do_arrays::1::x \(\) -> \{\[0\] = 15 @ \[34\]\n\[1\] = 10 @ \[35\]\n\} @ \[35\]
+do_arrays::1::x \(\) -> \{\[0\] = 20 @ \[37\]\n\[1\] = 10 @ \[35\]\n\} @ \[37\]
+do_arrays::1::x \(\) -> \{\[0\] = 20 @ \[37\, 39\]\n\[1\] = 10 @ \[35\]\n\} @ \[37\, 39\]
+do_arrays::1::x \(\) -> \{\[0\] = 0 @ \[41]\n\[1\] = 10 @ \[35\]\n\} @ \[41\]
+do_arrays::1::x \(\) -> \{\[0\] = 3 @ \[43]\n\[1\] = 10 @ \[35\]\n\} @ \[43\]
+do_arrays::1::x \(\) -> \{\[0\] = TOP @ \[43\, 45]\n\[1\] = 10 @ \[35\]\n\} @ \[43\, 45\]
+do_arrays::1::x \(\) -> \{\[0\] = TOP @ \[43\, 45\, 48]\n\[1\] = 10 @ \[50\]\n\} @ \[50\]
+do_arrays::1::x \(\) -> \{\[0\] = 20 @ \[51]\n\[1\] = 10 @ \[50\]\n\} @ \[51\]
diff --git a/regression/goto-analyzer/sensitivity-last-written-locations-pointers/test.desc b/regression/goto-analyzer/sensitivity-last-written-locations-pointers/test.desc
@@ -8,30 +8,30 @@ activate-multi-line-match
 main#return_value \(\) -> TOP @ \[1\]
 __CPROVER_dead_object \(\) -> TOP @ \[5\]
 __CPROVER_deallocated \(\) -> TOP @ \[6\]
-__CPROVER_malloc_is_new_array \(\) -> FALSE @ \[10\]
-__CPROVER_malloc_object \(\) -> TOP @ \[12\]
-__CPROVER_malloc_size \(\) -> 0ull? @ \[13\]
-__CPROVER_memory_leak \(\) -> TOP @ \[15\]
-__CPROVER_next_thread_id \(\) -> 0ul @ \[16\]
-__CPROVER_pipe_count \(\) -> 0u @ \[18\]
-__CPROVER_rounding_mode \(\) -> 0 @ \[19\]
-__CPROVER_thread_id \(\) -> 0ul @ \[20\]
-__CPROVER_threads_exited \(\) -> TOP @ \[23\]
-do_pointers::1::bool_ \(\) -> TOP @ \[25\]
-do_pointers::1::bool_1 \(\) -> TOP @ \[26\]
-do_pointers::1::bool_2 \(\) -> TOP @ \[27\]
-do_pointers::1::x \(\) -> TOP @ \[28\]
-do_pointers::1::x \(\) -> 10 @ \[29\]
-do_pointers::1::x_p \(\) -> TOP @ \[30\]
-do_pointers::1::y \(\) -> TOP @ \[31\]
-do_pointers::1::y \(\) -> 20 @ \[32\]
-do_pointers::1::y_p \(\) -> TOP @ \[33\]
-do_pointers::1::x_p \(\) -> ptr ->\(do_pointers::1::x\) @ \[34\]
-do_pointers::1::x \(\) -> 30 @ \[35\]
-do_pointers::1::x \(\) -> 40 @ \[36\]
-do_pointers::1::x \(\) -> TOP @ \[37\]
-do_pointers::1::x \(\) -> 50 @ \[38\]
-do_pointers::1::y_p \(\) -> ptr ->\(do_pointers::1::x\) @ \[39\]
-do_pointers::1::x \(\) -> 60 @ \[40\]
-do_pointers::1::j \(\) -> TOP @ \[41\]
-do_pointers::1::j \(\) -> 60 @ \[42\]
+__CPROVER_malloc_is_new_array \(\) -> FALSE @ \[9\]
+__CPROVER_malloc_object \(\) -> TOP @ \[10\]
+__CPROVER_malloc_size \(\) -> 0ull? @ \[11\]
+__CPROVER_memory_leak \(\) -> TOP @ \[13\]
+__CPROVER_next_thread_id \(\) -> 0ul @ \[14\]
+__CPROVER_pipe_count \(\) -> 0u @ \[16\]
+__CPROVER_rounding_mode \(\) -> 0 @ \[17\]
+__CPROVER_thread_id \(\) -> 0ul @ \[18\]
+__CPROVER_threads_exited \(\) -> TOP @ \[21\]
+do_pointers::1::bool_ \(\) -> TOP @ \[23\]
+do_pointers::1::bool_1 \(\) -> TOP @ \[24\]
+do_pointers::1::bool_2 \(\) -> TOP @ \[25\]
+do_pointers::1::x \(\) -> TOP @ \[26\]
+do_pointers::1::x \(\) -> 10 @ \[27\]
+do_pointers::1::x_p \(\) -> TOP @ \[28\]
+do_pointers::1::y \(\) -> TOP @ \[29\]
+do_pointers::1::y \(\) -> 20 @ \[30\]
+do_pointers::1::y_p \(\) -> TOP @ \[31\]
+do_pointers::1::x_p \(\) -> ptr ->\(do_pointers::1::x\) @ \[32\]
+do_pointers::1::x \(\) -> 30 @ \[33\]
+do_pointers::1::x \(\) -> 40 @ \[34\]
+do_pointers::1::x \(\) -> TOP @ \[35\]
+do_pointers::1::x \(\) -> 50 @ \[36\]
+do_pointers::1::y_p \(\) -> ptr ->\(do_pointers::1::x\) @ \[37\]
+do_pointers::1::x \(\) -> 60 @ \[38\]
+do_pointers::1::j \(\) -> TOP @ \[39\]
+do_pointers::1::j \(\) -> 60 @ \[40\]
diff --git a/regression/goto-analyzer/sensitivity-last-written-locations-structs/test.desc b/regression/goto-analyzer/sensitivity-last-written-locations-structs/test.desc
@@ -8,36 +8,36 @@ activate-multi-line-match
 main#return_value \(\) -> TOP @ \[1\]
 __CPROVER_dead_object \(\) -> TOP @ \[5\]
 __CPROVER_deallocated \(\) -> TOP @ \[6\]
-__CPROVER_malloc_is_new_array \(\) -> FALSE @ \[10\]
-__CPROVER_malloc_object \(\) -> TOP @ \[12\]
-__CPROVER_malloc_size \(\) -> 0ull? @ \[13\]
-__CPROVER_memory_leak \(\) -> TOP @ \[15\]
-__CPROVER_next_thread_id \(\) -> 0ul @ \[16\]
-__CPROVER_pipe_count \(\) -> 0u @ \[18\]
-__CPROVER_rounding_mode \(\) -> 0 @ \[19\]
-__CPROVER_thread_id \(\) -> 0ul @ \[20\]
-__CPROVER_threads_exited \(\) -> TOP @ \[23\]
-do_structs::1::bool_ \(\) -> TOP @ \[25\]
-do_structs::1::bool_1 \(\) -> TOP @ \[26\]
-do_structs::1::bool_2 \(\) -> TOP @ \[27\]
-do_structs::1::st \(\) -> \{\} @ \[28\]
-do_structs::1::st \(\) -> \{.x=10 @ \[29\]\} @ \[29\]
-do_structs::1::st \(\) -> \{.x=10 @ \[29\]\, .y=20 @ \[30\]\} @ \[30\]
-do_structs::1::st \(\) -> \{.x=30 @ \[31\]\, .y=20 @ \[30\]\} @ \[31\]
-do_structs::1::st \(\) -> \{.x=30 @ \[31\]\, .y=40 @ \[32\]\} @ \[32\]
-do_structs::1::st \(\) -> \{.x=30 @ \[31\]\, .y=30 @ \[33\]\} @ \[33\]
-do_structs::1::st \(\) -> \{.x=30 @ \[34\]\, .y=30 @ \[33\]\} @ \[34\]
-do_structs::1::st \(\) -> \{.x=5 @ \[35\]\, .y=30 @ \[33\]\} @ \[35\]
-do_structs::1::st \(\) -> \{.x=15 @ \[36\]\, .y=30 @ \[33\]\} @ \[36\]
-do_structs::1::st \(\) -> \{.x=15 @ \[36\]\, .y=10 @ \[37\]\} @ \[37\]
-do_structs::1::st \(\) -> \{.x=20 @ \[39\]\, .y=10 @ \[37\]\} @ \[39\]
-do_structs::1::st \(\) -> \{.x=20 @ \[39\, 41\]\, .y=10 @ \[37\]\} @ \[39\, 41\]
-do_structs::1::st \(\) -> \{.x=0 @ \[43\]\, .y=10 @ \[37\]\} @ \[43\]
-do_structs::1::st \(\) -> \{.x=3 @ \[45\]\, .y=10 @ \[37\]\} @ \[45\]
-do_structs::1::st \(\) -> \{.x=TOP @ \[45\, 47\]\, .y=10 @ \[37\]\} @ \[45\, 47\]
-do_structs::1::st \(\) -> \{.x=TOP @ \[45\, 47\, 50\]\, .y=10 @ \[37\]\} @ \[45\, 47\, 50\]
-do_structs::1::st \(\) -> \{.x=TOP @ \[45\, 47\, 50\]\, .y=10 @ \[52\]\} @ \[52\]
-do_structs::1::st \(\) -> \{.x=20 @ \[53\]\, .y=10 @ \[52\]\} @ \[53\]
-do_structs::1::new_age \(\) -> \{\} @ \[54\]
-do_structs::1::new_age \(\) -> \{.x=20 @ \[55\]\, .y=10 @ \[55\]\} @ \[55\]
+__CPROVER_malloc_is_new_array \(\) -> FALSE @ \[9\]
+__CPROVER_malloc_object \(\) -> TOP @ \[10\]
+__CPROVER_malloc_size \(\) -> 0ull? @ \[11\]
+__CPROVER_memory_leak \(\) -> TOP @ \[13\]
+__CPROVER_next_thread_id \(\) -> 0ul @ \[14\]
+__CPROVER_pipe_count \(\) -> 0u @ \[16\]
+__CPROVER_rounding_mode \(\) -> 0 @ \[17\]
+__CPROVER_thread_id \(\) -> 0ul @ \[18\]
+__CPROVER_threads_exited \(\) -> TOP @ \[21\]
+do_structs::1::bool_ \(\) -> TOP @ \[23\]
+do_structs::1::bool_1 \(\) -> TOP @ \[24\]
+do_structs::1::bool_2 \(\) -> TOP @ \[25\]
+do_structs::1::st \(\) -> \{\} @ \[26\]
+do_structs::1::st \(\) -> \{.x=10 @ \[27\]\} @ \[27\]
+do_structs::1::st \(\) -> \{.x=10 @ \[27\]\, .y=20 @ \[28\]\} @ \[28\]
+do_structs::1::st \(\) -> \{.x=30 @ \[29\]\, .y=20 @ \[28\]\} @ \[29\]
+do_structs::1::st \(\) -> \{.x=30 @ \[29\]\, .y=40 @ \[30\]\} @ \[30\]
+do_structs::1::st \(\) -> \{.x=30 @ \[29\]\, .y=30 @ \[31\]\} @ \[31\]
+do_structs::1::st \(\) -> \{.x=30 @ \[32\]\, .y=30 @ \[31\]\} @ \[32\]
+do_structs::1::st \(\) -> \{.x=5 @ \[33\]\, .y=30 @ \[31\]\} @ \[33\]
+do_structs::1::st \(\) -> \{.x=15 @ \[34\]\, .y=30 @ \[31\]\} @ \[34\]
+do_structs::1::st \(\) -> \{.x=15 @ \[34\]\, .y=10 @ \[35\]\} @ \[35\]
+do_structs::1::st \(\) -> \{.x=20 @ \[37\]\, .y=10 @ \[35\]\} @ \[37\]
+do_structs::1::st \(\) -> \{.x=20 @ \[37\, 39\]\, .y=10 @ \[35\]\} @ \[37\, 39\]
+do_structs::1::st \(\) -> \{.x=0 @ \[41\]\, .y=10 @ \[35\]\} @ \[41\]
+do_structs::1::st \(\) -> \{.x=3 @ \[43\]\, .y=10 @ \[35\]\} @ \[43\]
+do_structs::1::st \(\) -> \{.x=TOP @ \[43\, 45\]\, .y=10 @ \[35\]\} @ \[43\, 45\]
+do_structs::1::st \(\) -> \{.x=TOP @ \[43\, 45\, 48\]\, .y=10 @ \[35\]\} @ \[43\, 45\, 48\]
+do_structs::1::st \(\) -> \{.x=TOP @ \[43\, 45\, 48\]\, .y=10 @ \[50\]\} @ \[50\]
+do_structs::1::st \(\) -> \{.x=20 @ \[51\]\, .y=10 @ \[50\]\} @ \[51\]
+do_structs::1::new_age \(\) -> \{\} @ \[52\]
+do_structs::1::new_age \(\) -> \{.x=20 @ \[53\]\, .y=10 @ \[53\]\} @ \[53\]
 --
diff --git a/regression/goto-analyzer/sensitivity-last-written-locations-variables/test.desc b/regression/goto-analyzer/sensitivity-last-written-locations-variables/test.desc
@@ -7,43 +7,43 @@ main#return_value \(\) -> TOP @ \[1\]
 __CPROVER_alloca_object \(\) -> TOP @ \[4\]
 __CPROVER_dead_object \(\) -> TOP @ \[5\]
 __CPROVER_deallocated \(\) -> TOP @ \[6\]
-__CPROVER_malloc_is_new_array \(\) -> FALSE @ \[10\]
-__CPROVER_malloc_object \(\) -> TOP @ \[12\]
-__CPROVER_malloc_size \(\) -> 0ull? @ \[13\]
-__CPROVER_memory_leak \(\) -> TOP @ \[15\]
-__CPROVER_next_thread_id \(\) -> 0ul @ \[16\]
-__CPROVER_next_thread_key \(\) -> 0ul @ \[17\]
-__CPROVER_pipe_count \(\) -> 0u @ \[18\]
-__CPROVER_rounding_mode \(\) -> 0 @ \[19\]
-__CPROVER_thread_id \(\) -> 0ul @ \[20\]
-__CPROVER_thread_key_dtors \(\) -> TOP @ \[21\]
-__CPROVER_thread_keys \(\) -> TOP @ \[22\]
-__CPROVER_threads_exited \(\) -> TOP @ \[23\]
-global_x \(\) -> 0 @ \[24\]
-do_variables::1::bool_ \(\) -> TOP @ \[26\]
-do_variables::1::bool_1 \(\) -> TOP @ \[27\]
-do_variables::1::bool_2 \(\) -> TOP @ \[28\]
-global_x \(\) -> 5 @ \[29\]
-do_variables::1::x \(\) -> TOP @ \[30\]
-do_variables::1::x \(\) -> 10 @ \[31\]
-do_variables::1::y \(\) -> TOP @ \[32\]
-do_variables::1::y \(\) -> 20 @ \[33\]
-do_variables::1::x \(\) -> 30 @ \[34\]
-do_variables::1::y \(\) -> 40 @ \[35\]
-do_variables::1::y \(\) -> 30 @ \[36\]
-do_variables::1::x \(\) -> 30 @ \[37\]
-do_variables::1::x \(\) -> 5 @ \[38\]
-do_variables::1::x \(\) -> 15 @ \[39\]
-do_variables::1::y \(\) -> 10 @ \[40\]
-do_variables::1::x \(\) -> 20 @ \[42\]
-do_variables::1::x \(\) -> 20 @ \[42\, 44\]
-do_variables::1::x \(\) -> 50 @ \[46\]
-do_variables::1::x \(\) -> 20 @ \[48\]
-do_variables::1::x \(\) -> TOP @ \[48\, 50\]
-do_variables::1::x \(\) -> 0 @ \[52\]
-do_variables::1::x \(\) -> 3 @ \[54\]
-do_variables::1::x \(\) -> TOP @ \[54\, 56\]
-do_variables::1::x \(\) -> TOP @ \[54\, 56\, 59\]
-do_variables::1::y \(\) -> 10 @ \[61\]
-do_variables::1::x \(\) -> 20 @ \[62\]
+__CPROVER_malloc_is_new_array \(\) -> FALSE @ \[9\]
+__CPROVER_malloc_object \(\) -> TOP @ \[10\]
+__CPROVER_malloc_size \(\) -> 0ull? @ \[11\]
+__CPROVER_memory_leak \(\) -> TOP @ \[13\]
+__CPROVER_next_thread_id \(\) -> 0ul @ \[14\]
+__CPROVER_next_thread_key \(\) -> 0ul @ \[15\]
+__CPROVER_pipe_count \(\) -> 0u @ \[16\]
+__CPROVER_rounding_mode \(\) -> 0 @ \[17\]
+__CPROVER_thread_id \(\) -> 0ul @ \[18\]
+__CPROVER_thread_key_dtors \(\) -> TOP @ \[19\]
+__CPROVER_thread_keys \(\) -> TOP @ \[20\]
+__CPROVER_threads_exited \(\) -> TOP @ \[21\]
+global_x \(\) -> 0 @ \[22\]
+do_variables::1::bool_ \(\) -> TOP @ \[24\]
+do_variables::1::bool_1 \(\) -> TOP @ \[25\]
+do_variables::1::bool_2 \(\) -> TOP @ \[26\]
+global_x \(\) -> 5 @ \[27\]
+do_variables::1::x \(\) -> TOP @ \[28\]
+do_variables::1::x \(\) -> 10 @ \[29\]
+do_variables::1::y \(\) -> TOP @ \[30\]
+do_variables::1::y \(\) -> 20 @ \[31\]
+do_variables::1::x \(\) -> 30 @ \[32\]
+do_variables::1::y \(\) -> 40 @ \[33\]
+do_variables::1::y \(\) -> 30 @ \[34\]
+do_variables::1::x \(\) -> 30 @ \[35\]
+do_variables::1::x \(\) -> 5 @ \[36\]
+do_variables::1::x \(\) -> 15 @ \[37\]
+do_variables::1::y \(\) -> 10 @ \[38\]
+do_variables::1::x \(\) -> 20 @ \[40\]
+do_variables::1::x \(\) -> 20 @ \[40\, 42\]
+do_variables::1::x \(\) -> 50 @ \[44\]
+do_variables::1::x \(\) -> 20 @ \[46\]
+do_variables::1::x \(\) -> TOP @ \[46\, 48\]
+do_variables::1::x \(\) -> 0 @ \[50\]
+do_variables::1::x \(\) -> 3 @ \[52\]
+do_variables::1::x \(\) -> TOP @ \[52\, 54\]
+do_variables::1::x \(\) -> TOP @ \[52\, 54\, 57\]
+do_variables::1::y \(\) -> 10 @ \[59\]
+do_variables::1::x \(\) -> 20 @ \[60\]
 --
diff --git a/regression/goto-analyzer/sensitivity-test-data-dependency-context/test.desc b/regression/goto-analyzer/sensitivity-test-data-dependency-context/test.desc
@@ -5,8 +5,8 @@ data-dependency-context.c
 activate-multi-line-match
 ^EXIT=0$
 ^SIGNAL=0$
-st \(\) -> \{.a=.* @ \[2, 57\]\[Data dependencies: 57, 2\]\[Data dominators: \], .b=.* @ \[5, 57\]\[Data dependencies: 57, 5\]\[Data dominators: \]\} @ \[2, 5, 57\]\[Data dependencies: 57, 5, 2\]\[Data dominators: 57\]
-ar \(\) -> \{\[0\] = TOP @ \[11\, 51\]\[Data dependencies: 51\, 11\]\[Data dominators: \]\n\[1\] = TOP @ \[14\, 51\]\[Data dependencies: 51\, 14\]\[Data dominators: \]\n\} @ \[11\, 14\, 51\]\[Data dependencies: 51\, 14\, 11\]\[Data dominators: 51\]
-arr \(\) -> \{\[0\] = 1 @ \[19\]\[Data dependencies: 19\]\[Data dominators: 19\]\n\[1\] = 2 @ \[20\]\[Data dependencies: 20\]\[Data dominators: 20\]\n\[2\] = TOP @ \[21, 23\]\[Data dependencies: 23, 21\]\[Data dominators: \]\n\} @ \[21, 23\]\[Data dependencies: 23, 21\]\[Data dominators: 52\]
+st \(\) -> \{.a=.* @ \[2, 55\]\[Data dependencies: 55, 2\]\[Data dominators: \], .b=.* @ \[5, 55\]\[Data dependencies: 55, 5\]\[Data dominators: \]\} @ \[2, 5, 55\]\[Data dependencies: 55, 5, 2\]\[Data dominators: 55\]
+ar \(\) -> \{\[0\] = TOP @ \[11\, 49\]\[Data dependencies: 49\, 11\]\[Data dominators: \]\n\[1\] = TOP @ \[14\, 49\]\[Data dependencies: 49\, 14\]\[Data dominators: \]\n\} @ \[11\, 14\, 49\]\[Data dependencies: 49\, 14\, 11\]\[Data dominators: 49\]
+arr \(\) -> \{\[0\] = 1 @ \[19\]\[Data dependencies: 19\]\[Data dominators: 19\]\n\[1\] = 2 @ \[20\]\[Data dependencies: 20\]\[Data dominators: 20\]\n\[2\] = TOP @ \[21, 23\]\[Data dependencies: 23, 21\]\[Data dominators: \]\n\} @ \[21, 23\]\[Data dependencies: 23, 21\]\[Data dominators: 50\]
 --
 ^warning: ignoring
diff --git a/regression/goto-analyzer/variable-sensitivity-dependence-graph-toyota/test.desc b/regression/goto-analyzer/variable-sensitivity-dependence-graph-toyota/test.desc
diff --git a/regression/goto-analyzer/variable-sensitivity-dependence-graph/test.desc b/regression/goto-analyzer/variable-sensitivity-dependence-graph/test.desc
diff --git a/regression/goto-analyzer/variable-sensitivity-dependence-graph17/test.desc b/regression/goto-analyzer/variable-sensitivity-dependence-graph17/test.desc
