C library: move pthreads related definitions to library

With the support of building initialisers while adding the library we
can move library-only symbols to the library. This avoids polluting the
initialisation function for all cases that don't actually use
pthreads-related library functions.

This removal of unused symbols required adding a symbol into the
array_of_bool_as_bitvec test, which previously implicitly relied on
those library-specific symbols in the patterns being tested for.

Author: tautschnig

regression/cbmc-concurrency/thread_chain_cbmc1/main.c

@@ -18,7 +18,7 @@
 typedef unsigned long thread_id_t;
 
 // Internal unbounded array indexed by local thread identifiers
-extern __CPROVER_bool __CPROVER_threads_exited[];
+__CPROVER_bool __CPROVER_threads_exited[__CPROVER_constant_infinity_uint];
 
 // A thread_chain is like a chain of threads `f, g, ...` where `f`
 // must terminate before `g` can start to run, and so forth.

regression/cbmc-concurrency/thread_chain_cbmc2/main.c

@@ -18,7 +18,7 @@
 typedef unsigned long thread_id_t;
 
 // Internal unbounded array indexed by local thread identifiers
-extern __CPROVER_bool __CPROVER_threads_exited[];
+__CPROVER_bool __CPROVER_threads_exited[__CPROVER_constant_infinity_uint];
 
 // A thread_chain is like a chain of threads `f, g, ...` where `f`
 // must terminate before `g` can start to run, and so forth.

regression/cbmc/array_of_bool_as_bitvec/main.c

@@ -3,6 +3,7 @@
 #include <stdlib.h>
 
 __CPROVER_bool w[8];
+__CPROVER_bool v[__CPROVER_constant_infinity_uint];
 
 void main()
 {

regression/cbmc/array_of_bool_as_bitvec/test-smt2-outfile.desc

@@ -1,15 +1,15 @@
 CORE broken-smt-backend
 main.c
 --smt2 --outfile -
-\(= \(select array_of\.2 i\) \(ite false #b1 #b0\)\)
-\(= \(select array\.3 \(\(_ zero_extend 32\) \|main::1::idx!0@1#1\|\)\) #b1\)
-\(= \(select array\.3 \(_ bv\d+ 64\)\) \(ite false #b1 #b0\)\)
+\(= \(select array_of\.0 i\) \(ite false #b1 #b0\)\)
+\(= \(select array\.1 \(\(_ zero_extend 32\) \|main::1::idx!0@1#1\|\)\) #b1\)
+\(= \(select array\.1 \(_ bv\d+ 64\)\) \(ite false #b1 #b0\)\)
 ^EXIT=0$
 ^SIGNAL=0$
 --
-\(= \(select array_of\.2 i\) false\)
-\(= \(select array\.3 \(\(_ zero_extend 32\) \|main::1::idx!0@1#1\|\)\) #b1 #b0\)
-\(= \(select array\.3 \(_ bv\d+ 64\)\) false\)
+\(= \(select array_of\.0 i\) false\)
+\(= \(select array\.1 \(\(_ zero_extend 32\) \|main::1::idx!0@1#1\|\)\) #b1 #b0\)
+\(= \(select array\.1 \(_ bv\d+ 64\)\) false\)
 --
 This test checks for correctness of BitVec-array encoding of Boolean arrays.
 

regression/cbmc/xml-trace/test.desc

@@ -7,7 +7,7 @@ activate-multi-line-match
 VERIFICATION FAILED
 <assignment assignment_type="actual_parameter" base_name="u" display_name="test::u" hidden="false" identifier="test::u" mode="C" step_nr="\d+" thread="0">\n\s*<location file=".*" line="\d+" working-directory=".*"/>\n\s*<full_lhs_type>union myunion</full_lhs_type>\n\s*<full_lhs>u</full_lhs>
 <value>\{ \.i=\d+ll? \}</value>\n\s*<value_expression>\n\s*<union>\n\s*<member member_name="i">\n\s*<integer binary="\d+" c_type=".*int.*" width="\d+">\d+</integer>\n\s*</member>\n\s*</union>\n\s*</value_expression>
-<assignment assignment_type="state" base_name="u" display_name="test::u" hidden="false" identifier="test::u" mode="C" step_nr="\d+" thread="0">\n\s*<location file=".*" function="test" line="\d+" working-directory=".*"/>\n\s*<full_lhs_type>signed long( long)? int</full_lhs_type>\n\s*<full_lhs>u\.i</full_lhs>\n\s*<full_lhs_value binary="[01]+">\d+ll?</full_lhs_value>\n\s*</assignment>
+<assignment assignment_type="state" base_name="u" display_name="test::u" hidden="false" identifier="test::u" mode="C" step_nr="\d+" thread="0">\n\s*<location file=".*" function="test" line="\d+" working-directory=".*"/>\n\s*<full_lhs_type>(signed long( long)? int|int64_t)</full_lhs_type>\n\s*<full_lhs>u\.i</full_lhs>\n\s*<full_lhs_value binary="[01]+">\d+ll?</full_lhs_value>\n\s*</assignment>
 --
 ^warning: ignoring
 --

regression/cprover/arrays/array1.desc

@@ -3,11 +3,11 @@ array1.c
 --text --solve --inline --no-safety
 ^EXIT=10$
 ^SIGNAL=0$
-^\(\d+\) ∀ ς : state \. S16\(ς\) ⇒ S17\(ς\[element_address\(❝array❞, .*1.*\):=10\]\)$
-^\(\d+\) ∀ ς : state \. S17\(ς\) ⇒ S18\(ς\[element_address\(❝array❞, .*2.*\):=20\]\)$
-^\(\d+\) ∀ ς : state \. S18\(ς\) ⇒ \(ς\(element_address\(❝array❞, .*1.*\)\) = 10\)$
-^\(\d+\) ∀ ς : state \. S19\(ς\) ⇒ \(ς\(element_address\(❝array❞, .*2.*\)\) = 20\)$
-^\(\d+\) ∀ ς : state \. S20\(ς\) ⇒ \(ς\(element_address\(❝array❞, .*2.*\)\) = 30\)$
+^\(\d+\) ∀ ς : state \. S10\(ς\) ⇒ S11\(ς\[element_address\(❝array❞, .*1.*\):=10\]\)$
+^\(\d+\) ∀ ς : state \. S11\(ς\) ⇒ S12\(ς\[element_address\(❝array❞, .*2.*\):=20\]\)$
+^\(\d+\) ∀ ς : state \. S12\(ς\) ⇒ \(ς\(element_address\(❝array❞, .*1.*\)\) = 10\)$
+^\(\d+\) ∀ ς : state \. S13\(ς\) ⇒ \(ς\(element_address\(❝array❞, .*2.*\)\) = 20\)$
+^\(\d+\) ∀ ς : state \. S14\(ς\) ⇒ \(ς\(element_address\(❝array❞, .*2.*\)\) = 30\)$
 ^\[main\.assertion\.1\] line \d+ property 1: SUCCESS$
 ^\[main\.assertion\.2\] line \d+ property 2: SUCCESS$
 ^\[main\.assertion\.3\] line \d+ property 3: REFUTED$

regression/cprover/arrays/array2.desc

@@ -3,9 +3,9 @@ array2.c
 --text --solve --inline --no-safety
 ^EXIT=10$
 ^SIGNAL=0$
-^\(\d+\) ∀ ς : state \. \(S19\(ς\) ∧ ς\(❝main::1::i❞\) = ς\(❝main::1::j❞\)\) ⇒ S20\(ς\)$
-^\(\d+\) ∀ ς : state \. S20\(ς\) ⇒ \(ς\(element_address\(❝main::1::array❞, cast\(ς\(❝main::1::i❞\), signedbv\[64\]\)\)\) = ς\(element_address\(❝main::1::array❞, cast\(ς\(❝main::1::j❞\), signedbv\[64\]\)\)\)\)$
-^\(\d+\) ∀ ς : state \. S21\(ς\) ⇒ \(ς\(element_address\(❝main::1::array❞, cast\(ς\(❝main::1::i❞\), signedbv\[64\]\)\)\) = ς\(element_address\(❝main::1::array❞, cast\(ς\(❝main::1::k❞\), signedbv\[64\]\)\)\)\)$
+^\(\d+\) ∀ ς : state \. \(S13\(ς\) ∧ ς\(❝main::1::i❞\) = ς\(❝main::1::j❞\)\) ⇒ S14\(ς\)$
+^\(\d+\) ∀ ς : state \. S14\(ς\) ⇒ \(ς\(element_address\(❝main::1::array❞, cast\(ς\(❝main::1::i❞\), signedbv\[64\]\)\)\) = ς\(element_address\(❝main::1::array❞, cast\(ς\(❝main::1::j❞\), signedbv\[64\]\)\)\)\)$
+^\(\d+\) ∀ ς : state \. S15\(ς\) ⇒ \(ς\(element_address\(❝main::1::array❞, cast\(ς\(❝main::1::i❞\), signedbv\[64\]\)\)\) = ς\(element_address\(❝main::1::array❞, cast\(ς\(❝main::1::k❞\), signedbv\[64\]\)\)\)\)$
 ^\[main\.assertion\.1\] line \d+ property 1: SUCCESS$
 ^\[main\.assertion\.2\] line \d+ property 2: REFUTED$
 --

regression/cprover/basic/assume1.desc

@@ -6,9 +6,9 @@ assume1.c
 ^ \(\d+\) ∀ ς : state \. initial_state\(ς\) ⇒ SInitial\(ς\)$
 ^ \(\d+\) S0 = SInitial$
 ^ \(\d+\) S1 = S0$
-^\(\d+\) ∀ ς : state \. \(S16\(ς\) ∧ ς\(❝main::1::x❞\) ≥ 10\) ⇒ S17\(ς\)$
-^\(\d+\) ∀ ς : state \. S17\(ς\) ⇒ \(ς\(❝main::1::x❞\) ≥ 5\)$
-^\(\d+\) ∀ ς : state \. S18\(ς\) ⇒ \(ς\(❝main::1::x❞\) ≥ 15\)$
+^\(\d+\) ∀ ς : state \. \(S10\(ς\) ∧ ς\(❝main::1::x❞\) ≥ 10\) ⇒ S11\(ς\)$
+^\(\d+\) ∀ ς : state \. S11\(ς\) ⇒ \(ς\(❝main::1::x❞\) ≥ 5\)$
+^\(\d+\) ∀ ς : state \. S12\(ς\) ⇒ \(ς\(❝main::1::x❞\) ≥ 15\)$
 ^\[main\.assertion\.1\] line \d+ property 1: SUCCESS$
 ^\[main\.assertion\.2\] line \d+ property 2: REFUTED$
 --

regression/cprover/basic/basic1.desc

@@ -5,8 +5,8 @@ basic1.c
 ^SIGNAL=0$
 ^ \(\d+\) ∀ ς : state \. initial_state\(ς\) ⇒ SInitial\(ς\)$
 ^ \(\d+\) S0 = SInitial$
-^\(\d+\) ∀ ς : state \. S13\(ς\) ⇒ S14\(ς\[❝x❞:=0\]\)$
-^\(\d+\) ∀ ς : state \. S16\(ς\) ⇒ S17\(ς\[❝x❞:=1\]\)$
-^\(\d+\) ∀ ς : state \. S17\(ς\) ⇒ \(ς\(❝x❞\) = 1\)$
+^\(\d+\) ∀ ς : state \. S7\(ς\) ⇒ S8\(ς\[❝x❞:=0\]\)$
+^\(\d+\) ∀ ς : state \. S10\(ς\) ⇒ S11\(ς\[❝x❞:=1\]\)$
+^\(\d+\) ∀ ς : state \. S11\(ς\) ⇒ \(ς\(❝x❞\) = 1\)$
 ^\[main\.assertion\.1\] line \d+ property 1: SUCCESS$
 --

regression/cprover/basic/basic2.desc

@@ -3,11 +3,11 @@ basic2.c
 --text --solve --inline
 ^EXIT=0$
 ^SIGNAL=0$
-^\(\d+\) ∀ ς : state \. S13\(ς\) ⇒ S14\(ς\[❝x❞:=0\]\)$
-^\(\d+\) S15 = S14$
-^\(\d+\) S16 = S15$
-^\(\d+\) ∀ ς : state \. S16\(ς\) ⇒ S17\(ς\[❝x❞:=1\]\)$
-^\(\d+\) S18 = S17$
-^\(\d+\) ∀ ς : state \. S18\(ς\) ⇒ \(ς\(❝x❞\) = 1\)$
+^\(\d+\) ∀ ς : state \. S7\(ς\) ⇒ S8\(ς\[❝x❞:=0\]\)$
+^\(\d+\) S9 = S8$
+^\(\d+\) S10 = S9$
+^\(\d+\) ∀ ς : state \. S10\(ς\) ⇒ S11\(ς\[❝x❞:=1\]\)$
+^\(\d+\) S12 = S11$
+^\(\d+\) ∀ ς : state \. S12\(ς\) ⇒ \(ς\(❝x❞\) = 1\)$
 ^\[main\.assertion\.1\] line \d+ property 1: SUCCESS$
 --

regression/cprover/basic/basic3.desc

@@ -3,10 +3,10 @@ basic3.c
 --text --solve --inline
 ^EXIT=0$
 ^SIGNAL=0$
-\(\d+\) ∀ ς : state \. S13\(ς\) ⇒ S14\(ς\[❝x❞:=0\]\)
-\(\d+\) ∀ ς : state \. S14\(ς\) ⇒ S15\(ς\[❝y❞:=0\]\)
-\(\d+\) ∀ ς : state \. S17\(ς\) ⇒ S18\(ς\[❝x❞:=1\]\)
-\(\d+\) ∀ ς : state \. S18\(ς\) ⇒ S19\(ς\[❝y❞:=2\]\)
-\(\d+\) ∀ ς : state \. S19\(ς\) ⇒ \(ς\(❝x❞\) = 1\)
+\(\d+\) ∀ ς : state \. S7\(ς\) ⇒ S8\(ς\[❝x❞:=0\]\)
+\(\d+\) ∀ ς : state \. S8\(ς\) ⇒ S9\(ς\[❝y❞:=0\]\)
+\(\d+\) ∀ ς : state \. S11\(ς\) ⇒ S12\(ς\[❝x❞:=1\]\)
+\(\d+\) ∀ ς : state \. S12\(ς\) ⇒ S13\(ς\[❝y❞:=2\]\)
+\(\d+\) ∀ ς : state \. S13\(ς\) ⇒ \(ς\(❝x❞\) = 1\)
 ^\[main\.assertion\.1\] line \d+ property 1: SUCCESS$
 --

regression/cprover/basic/basic4.desc

@@ -3,9 +3,9 @@ basic4.c
 --text --solve --inline
 ^EXIT=10$
 ^SIGNAL=0$
-^\(\d+\) ∀ ς : state \. S13\(ς\) ⇒ S14\(ς\[❝x❞:=0\]\)$
-^\(\d+\) ∀ ς : state \. S16\(ς\) ⇒ S17\(ς\[❝x❞:=1\]\)$
-^\(\d+\) ∀ ς : state \. S17\(ς\) ⇒ S18\(ς\[❝x❞:=2\]\)$
-^\(\d+\) ∀ ς : state \. S18\(ς\) ⇒ \(ς\(❝x❞\) = 1\)$
+^\(\d+\) ∀ ς : state \. S7\(ς\) ⇒ S8\(ς\[❝x❞:=0\]\)$
+^\(\d+\) ∀ ς : state \. S10\(ς\) ⇒ S11\(ς\[❝x❞:=1\]\)$
+^\(\d+\) ∀ ς : state \. S11\(ς\) ⇒ S12\(ς\[❝x❞:=2\]\)$
+^\(\d+\) ∀ ς : state \. S12\(ς\) ⇒ \(ς\(❝x❞\) = 1\)$
 ^\[main\.assertion\.1\] line \d+ property 1: REFUTED$
 --

regression/cprover/basic/basic5.desc

@@ -3,12 +3,12 @@ basic5.c
 --text --solve --inline
 ^EXIT=10$
 ^SIGNAL=0$
-^\(\d+\) ∀ ς : state \. S17\(ς\) ⇒ S18\(ς\[❝main::1::c1❞:=ς\(❝main::1::x❞\) ≥ 10\]\)$
-^\(\d+\) ∀ ς : state \. S18\(ς\) ⇒ S19\(enter_scope_state\(ς, ❝main::1::c2❞\)\)$
-^\(\d+\) ∀ ς : state \. S19\(ς\) ⇒ S20\(ς\[❝main::1::c2❞:=ς\(❝main::1::x❞\) ≥ 5\]\)$
-^\(\d+\) ∀ ς : state \. S20\(ς\) ⇒ \(ς\(❝main::1::c1❞\) ⇒ ς\(❝main::1::c2❞\)\)$
-^\(\d+\) S21 = S20$
-^\(\d+\) ∀ ς : state \. S21\(ς\) ⇒ \(ς\(❝main::1::c2❞\) ⇒ ς\(❝main::1::c1❞\)\)$
+^\(\d+\) ∀ ς : state \. S11\(ς\) ⇒ S12\(ς\[❝main::1::c1❞:=ς\(❝main::1::x❞\) ≥ 10\]\)$
+^\(\d+\) ∀ ς : state \. S12\(ς\) ⇒ S13\(enter_scope_state\(ς, ❝main::1::c2❞\)\)$
+^\(\d+\) ∀ ς : state \. S13\(ς\) ⇒ S14\(ς\[❝main::1::c2❞:=ς\(❝main::1::x❞\) ≥ 5\]\)$
+^\(\d+\) ∀ ς : state \. S14\(ς\) ⇒ \(ς\(❝main::1::c1❞\) ⇒ ς\(❝main::1::c2❞\)\)$
+^\(\d+\) S15 = S14$
+^\(\d+\) ∀ ς : state \. S15\(ς\) ⇒ \(ς\(❝main::1::c2❞\) ⇒ ς\(❝main::1::c1❞\)\)$
 ^\[main\.assertion\.1\] line \d+ property 1: SUCCESS$
 ^\[main\.assertion\.2\] line \d+ property 2: REFUTED$
 --

regression/cprover/basic/basic6.desc

@@ -3,11 +3,11 @@ basic6.c
 --text --solve --inline
 ^EXIT=0$
 ^SIGNAL=0$
-^\(19\) ∀ ς : state \. S16\(ς\) ⇒ S17\(ς\[❝x❞:=1\]\)$
-^\(20\) ∀ ς : state \. S17\(ς\) ⇒ S18\(ς\[❝x❞:=ς\(❝x❞\) \+ 1\]\)$
-^\(21\) ∀ ς : state \. S18\(ς\) ⇒ S19\(ς\[❝x❞:=ς\(❝x❞\) \+ 1\]\)$
-^\(22\) ∀ ς : state \. S19\(ς\) ⇒ S20\(ς\[❝x❞:=ς\(❝x❞\) \+ 1\]\)$
-^\(23\) ∀ ς : state \. S20\(ς\) ⇒ S21\(ς\[❝x❞:=ς\(❝x❞\) \+ 1\]\)$
-^\(24\) ∀ ς : state \. S21\(ς\) ⇒ \(ς\(❝x❞\) = 5\)$
+^\(13\) ∀ ς : state \. S10\(ς\) ⇒ S11\(ς\[❝x❞:=1\]\)$
+^\(14\) ∀ ς : state \. S11\(ς\) ⇒ S12\(ς\[❝x❞:=ς\(❝x❞\) \+ 1\]\)$
+^\(15\) ∀ ς : state \. S12\(ς\) ⇒ S13\(ς\[❝x❞:=ς\(❝x❞\) \+ 1\]\)$
+^\(16\) ∀ ς : state \. S13\(ς\) ⇒ S14\(ς\[❝x❞:=ς\(❝x❞\) \+ 1\]\)$
+^\(17\) ∀ ς : state \. S14\(ς\) ⇒ S15\(ς\[❝x❞:=ς\(❝x❞\) \+ 1\]\)$
+^\(18\) ∀ ς : state \. S15\(ς\) ⇒ \(ς\(❝x❞\) = 5\)$
 ^\[main\.assertion\.1\] line \d+ property 1: SUCCESS$
 --

regression/cprover/basic/nondet1.desc

@@ -3,13 +3,13 @@ nondet1.c
 --text --solve --inline
 ^EXIT=10$
 ^SIGNAL=0$
-^\(\d+\) ∀ ς : state, nondet::S18-0 : signedbv\[32\] \. S17\(ς\) ⇒ S18\(ς\[❝main::1::x❞:=nondet::S18-0\]\)$
-^\(\d+\) ∀ ς : state \. S18\(ς\) ⇒ \(ς\(❝main::1::x❞\) = 20\)$
-^\(\d+\) S19 = S18$
-^\(\d+\) ∀ ς : state, nondet::S20-0 : signedbv\[32\] \. S19\(ς\) ⇒ S20\(ς\[❝main::1::y❞:=nondet::S20-0\]\)$
-^\(\d+\) ∀ ς : state \. S20\(ς\) ⇒ \(ς\(❝main::1::x❞\) = ς\(❝main::1::y❞\)\)$
-^\(\d+\) S21 = S20$
-^\(\d+\) ∀ ς : state \. S21\(ς\) ⇒ S22\(ς\[❝return'❞:=0\]\)$
+^\(\d+\) ∀ ς : state, nondet::S12-0 : signedbv\[32\] \. S11\(ς\) ⇒ S12\(ς\[❝main::1::x❞:=nondet::S12-0\]\)$
+^\(\d+\) ∀ ς : state \. S12\(ς\) ⇒ \(ς\(❝main::1::x❞\) = 20\)$
+^\(\d+\) S13 = S12$
+^\(\d+\) ∀ ς : state, nondet::S14-0 : signedbv\[32\] \. S13\(ς\) ⇒ S14\(ς\[❝main::1::y❞:=nondet::S14-0\]\)$
+^\(\d+\) ∀ ς : state \. S14\(ς\) ⇒ \(ς\(❝main::1::x❞\) = ς\(❝main::1::y❞\)\)$
+^\(\d+\) S15 = S14$
+^\(\d+\) ∀ ς : state \. S15\(ς\) ⇒ S16\(ς\[❝return'❞:=0\]\)$
 ^\[main\.assertion\.1\] line \d+ property 1: REFUTED$
 ^\[main\.assertion\.2\] line \d+ property 2: REFUTED$
 --

regression/cprover/branching/branching1.desc

@@ -3,20 +3,20 @@ branching1.c
 --text --solve --inline
 ^EXIT=10$
 ^SIGNAL=0$
-^\(\d+\) ∀ ς : state \. \(S16\(ς\) ∧ ¬\(ς\(❝main::1::x❞\) ≥ 5\)\) ⇒ S17T\(\ς\)$
-^\(\d+\) ∀ ς : state \. \(S16\(ς\) ∧ ς\(❝main::1::x❞\) ≥ 5\) ⇒ S17\(ς\)$
-^\(\d+\) ∀ ς : state \. S17\(ς\) ⇒ \(ς\(❝main::1::x❞\) ≥ 5\)$
-^\(\d+\) S18 = S17$
-^\(\d+\) ∀ ς : state \. S18\(ς\) ⇒ \(0 ≠ 0\)$
-^\(\d+\) S19 = S18$
-^\(\d+\) S20 = S19$
-^\(\d+\) ∀ ς : state \. S17T\(ς\) ⇒ \(ς\(❝main::1::x❞\) < 5\)$
-^\(\d+\) S21 = S17T$
-^\(\d+\) ∀ ς : state \. S21\(ς\) ⇒ \(0 ≠ 0\)$
-^\(\d+\) S22 = S21$
-^\(\d+\) ∀ ς : state \. S20\(ς\) ⇒ S23in\(ς\)$
-^\(\d+\) ∀ ς : state \. S22\(ς\) ⇒ S23in\(ς\)$
-^\(\d+\) S23 = S23in$
+^\(\d+\) ∀ ς : state \. \(S10\(ς\) ∧ ¬\(ς\(❝main::1::x❞\) ≥ 5\)\) ⇒ S11T\(\ς\)$
+^\(\d+\) ∀ ς : state \. \(S10\(ς\) ∧ ς\(❝main::1::x❞\) ≥ 5\) ⇒ S11\(ς\)$
+^\(\d+\) ∀ ς : state \. S11\(ς\) ⇒ \(ς\(❝main::1::x❞\) ≥ 5\)$
+^\(\d+\) S12 = S11$
+^\(\d+\) ∀ ς : state \. S12\(ς\) ⇒ \(0 ≠ 0\)$
+^\(\d+\) S13 = S12$
+^\(\d+\) S14 = S13$
+^\(\d+\) ∀ ς : state \. S11T\(ς\) ⇒ \(ς\(❝main::1::x❞\) < 5\)$
+^\(\d+\) S15 = S11T$
+^\(\d+\) ∀ ς : state \. S15\(ς\) ⇒ \(0 ≠ 0\)$
+^\(\d+\) S16 = S15$
+^\(\d+\) ∀ ς : state \. S14\(ς\) ⇒ S17in\(ς\)$
+^\(\d+\) ∀ ς : state \. S16\(ς\) ⇒ S17in\(ς\)$
+^\(\d+\) S17 = S17in$
 ^\[main\.assertion\.1\] line \d+ property 1: SUCCESS$
 ^\[main\.assertion\.2\] line \d+ property 2: REFUTED$
 ^\[main\.assertion\.3\] line \d+ property 3: SUCCESS$

regression/cprover/branching/branching2.desc

@@ -3,14 +3,14 @@ branching2.c
 --text --solve --inline
 ^EXIT=10$
 ^SIGNAL=0$
-^\(\d+\) ∀ ς : state \. \(S17\(ς\) ∧ ¬\(ς\(❝main::1::a❞\) ≥ 5\)\) ⇒ S18T\(ς\)$
-^\(\d+\) ∀ ς : state \. \(S17\(ς\) ∧ ς\(❝main::1::a❞\) ≥ 5\) ⇒ S18\(ς\)$
-^\(\d+\) ∀ ς : state \. S18\(ς\) ⇒ S19\(ς\[❝main::1::b❞:=1\]\)$
-^\(\d+\) S20 = S19$
-^\(\d+\) ∀ ς : state \. S18T\(ς\) ⇒ S21\(ς\[❝main::1::b❞:=0\]\)$
-^\(\d+\) ∀ ς : state \. S20\(ς\) ⇒ S22in\(ς\)$
-^\(\d+\) ∀ ς : state \. S21\(ς\) ⇒ S22in\(ς\)$
-^\(\d+\) S22 = S22in$
+^\(\d+\) ∀ ς : state \. \(S11\(ς\) ∧ ¬\(ς\(❝main::1::a❞\) ≥ 5\)\) ⇒ S12T\(ς\)$
+^\(\d+\) ∀ ς : state \. \(S11\(ς\) ∧ ς\(❝main::1::a❞\) ≥ 5\) ⇒ S12\(ς\)$
+^\(\d+\) ∀ ς : state \. S12\(ς\) ⇒ S13\(ς\[❝main::1::b❞:=1\]\)$
+^\(\d+\) S14 = S13$
+^\(\d+\) ∀ ς : state \. S12T\(ς\) ⇒ S15\(ς\[❝main::1::b❞:=0\]\)$
+^\(\d+\) ∀ ς : state \. S14\(ς\) ⇒ S16in\(ς\)$
+^\(\d+\) ∀ ς : state \. S15\(ς\) ⇒ S16in\(ς\)$
+^\(\d+\) S16 = S16in$
 ^\[main\.assertion\.1\] line \d+ property 1: SUCCESS$
 ^\[main\.assertion\.2\] line \d+ property 2: REFUTED$
 --

regression/cprover/float/basic-float1.desc

@@ -3,7 +3,7 @@ basic-float1.c
 --text --solve --inline
 ^EXIT=0$
 ^SIGNAL=0$
-^\(\d+\) ∀ ς : state \. S16\(ς\) ⇒ S17\(ς\[❝main::1::f❞:=floatbv_typecast\(1, floatbv\[32\], ς\(❝__CPROVER_rounding_mode❞\)\)\]\)$
-^\(\d+\) ∀ ς : state \. S17\(ς\) ⇒ ieee_float_equal\(floatbv_plus\(ς\(❝main::1::f❞\), 0\.5, ς\(❝__CPROVER_rounding_mode❞\)\), 1\.5\)$
+^\(\d+\) ∀ ς : state \. S10\(ς\) ⇒ S11\(ς\[❝main::1::f❞:=floatbv_typecast\(1, floatbv\[32\], ς\(❝__CPROVER_rounding_mode❞\)\)\]\)$
+^\(\d+\) ∀ ς : state \. S11\(ς\) ⇒ ieee_float_equal\(floatbv_plus\(ς\(❝main::1::f❞\), 0\.5, ς\(❝__CPROVER_rounding_mode❞\)\), 1\.5\)$
 ^\[main\.assertion\.1\] line \d+ addition: SUCCESS$
 --

regression/cprover/function_calls/call_no_body1.desc

@@ -4,6 +4,6 @@ call_no_body1.c
 ^EXIT=0$
 ^SIGNAL=0$
 ^\*\*\*\* WARNING: no body for function function_without_body$
-^\(\d+\) ∀ ς : state, nondet::S24\.2-0 : signedbv\[32\] \. S24\.1\(ς\) ⇒ S24\.2\(ς\[❝main::\$tmp::return_value_function_without_body❞:=nondet::S24\.2-0\]\)$
-^\(\d+\) ∀ ς : state \. S24\.2\(ς\) ⇒ S24\.3\(ς\[❝main::1::x❞:=ς\(❝main::\$tmp::return_value_function_without_body❞\)\]\)$
+^\(\d+\) ∀ ς : state, nondet::S18\.2-0 : signedbv\[32\] \. S18\.1\(ς\) ⇒ S18\.2\(ς\[❝main::\$tmp::return_value_function_without_body❞:=nondet::S18\.2-0\]\)$
+^\(\d+\) ∀ ς : state \. S18\.2\(ς\) ⇒ S18\.3\(ς\[❝main::1::x❞:=ς\(❝main::\$tmp::return_value_function_without_body❞\)\]\)$
 --

regression/cprover/function_calls/call_no_body2.desc

@@ -3,5 +3,5 @@ call_no_body2.c
 --text
 ^EXIT=0$
 ^SIGNAL=0$
-^\(\d+\) ∀ ς : state, nondet::S24\.2-0 : signedbv\[32\] \. S24\.1\(ς\) ⇒ S24\.2\(ς\[❝main::\$tmp::return_value_function_without_body❞\.❝x❞:=nondet::S24\.2-0\]\)$
+^\(\d+\) ∀ ς : state, nondet::S18\.2-0 : signedbv\[32\] \. S18\.1\(ς\) ⇒ S18\.2\(ς\[❝main::\$tmp::return_value_function_without_body❞\.❝x❞:=nondet::S18\.2-0\]\)$
 --

regression/cprover/loops/do_while1.desc

@@ -3,12 +3,12 @@ do_while1.c
 --text --solve --inline
 ^EXIT=0$
 ^SIGNAL=0$
-^\(\d+\) ∀ ς : state \. S16\(ς\) ⇒ S17\(ς\[❝x❞:=10\]\)$
-^\(\d+\) ∀ ς : state \. S19T\(ς\) ⇒ S18in\(ς\)$
-^\(\d+\) ∀ ς : state \. S17\(ς\) ⇒ S18in\(ς\)$
-^\(\d+\) ∀ ς : state \. S18in\(ς\) ⇒ S18\(ς\[❝x❞:=20\]\)$
-^\(\d+\) ∀ ς : state . \(S18\(ς\) ∧ ς\(❝x❞\) ≠ 20\) ⇒ S19T\(ς\)$
-^\(\d+\) ∀ ς : state . \(S18\(ς\) ∧ ¬\(ς\(❝x❞\) ≠ 20\)\) ⇒ S19\(ς\)$
+^\(\d+\) ∀ ς : state \. S10\(ς\) ⇒ S11\(ς\[❝x❞:=10\]\)$
+^\(\d+\) ∀ ς : state \. S13T\(ς\) ⇒ S12in\(ς\)$
+^\(\d+\) ∀ ς : state \. S11\(ς\) ⇒ S12in\(ς\)$
+^\(\d+\) ∀ ς : state \. S12in\(ς\) ⇒ S12\(ς\[❝x❞:=20\]\)$
+^\(\d+\) ∀ ς : state . \(S12\(ς\) ∧ ς\(❝x❞\) ≠ 20\) ⇒ S13T\(ς\)$
+^\(\d+\) ∀ ς : state . \(S12\(ς\) ∧ ¬\(ς\(❝x❞\) ≠ 20\)\) ⇒ S13\(ς\)$
 ^\[main\.assertion\.1\] line \d+ property 1: SUCCESS$
 --
 --

regression/cprover/loops/for1.desc

@@ -3,14 +3,14 @@ for1.c
 --text --solve --inline
 ^EXIT=0$
 ^SIGNAL=0$
-^\(\d+\) ∀ ς : state \. S21\(ς\) ⇒ S18in\(ς\)$
-^\(\d+\) ∀ ς : state \. S17\(ς\) ⇒ S18in\(ς\)$
-^\(\d+\) ∀ ς : state \. \(S18in\(ς\) ∧ ¬\(ς\(❝main::1::i❞\) < 10\)\) ⇒ S18T\(ς\)$
-^\(\d+\) ∀ ς : state \. \(S18in\(ς\) ∧ ς\(❝main::1::i❞\) < 10\) ⇒ S18\(ς\)$
-^\(\d+\) S19 = S18$
-^\(\d+\) ∀ ς : state \. S19\(ς\) ⇒ S20\(ς\[❝main::1::i❞:=ς\(❝main::1::i❞\) \+ 1\]\)$
-^\(\d+\) S21 = S20$
-^\(\d+\) S22 = S18T$
+^\(\d+\) ∀ ς : state \. S15\(ς\) ⇒ S12in\(ς\)$
+^\(\d+\) ∀ ς : state \. S11\(ς\) ⇒ S12in\(ς\)$
+^\(\d+\) ∀ ς : state \. \(S12in\(ς\) ∧ ¬\(ς\(❝main::1::i❞\) < 10\)\) ⇒ S12T\(ς\)$
+^\(\d+\) ∀ ς : state \. \(S12in\(ς\) ∧ ς\(❝main::1::i❞\) < 10\) ⇒ S12\(ς\)$
+^\(\d+\) S13 = S12$
+^\(\d+\) ∀ ς : state \. S13\(ς\) ⇒ S14\(ς\[❝main::1::i❞:=ς\(❝main::1::i❞\) \+ 1\]\)$
+^\(\d+\) S15 = S14$
+^\(\d+\) S16 = S12T$
 ^\[main\.assertion\.1\] line \d+ property 1: SUCCESS$
 --
 --