Skip to content

Commit 22c020b

Browse files
author
Remi Delmas
committed
Function contracts: new method for havocking assigns clause targets
that works when there are dependencies between targets. We now take a snapshot of the target addresses if they are valid and havoc them in a second step if they are valid. Previously we were havocking targets directly in an arbitrary sequence, and havocking s->ptr before *(s->ptr) before __CPROVER_POINTER_OBJECT(s->ptr) would cause spurious errors.
1 parent c65d0ff commit 22c020b

File tree

17 files changed

+524
-15
lines changed

17 files changed

+524
-15
lines changed

regression/contracts/assigns_enforce_21/test.desc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ main.c
44
^EXIT=10$
55
^SIGNAL=0$
66
main.c function bar
7-
^\[bar.\d+\] line \d+ Check that \*y is assignable: SUCCESS$
8-
^\[bar.\d+\] line \d+ Check that x is assignable: FAILURE$
7+
^\[bar\.\d+\] line \d+ Check that \*y is assignable: SUCCESS$
8+
^\[bar\.\d+\] line \d+ Check that x \(assigned by the contract of quz\) is assignable: FAILURE
99
^VERIFICATION FAILED$
1010
--
1111
--

regression/contracts/assigns_replace_08/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ main.c
33
--enforce-contract foo --replace-call-with-contract bar _ --pointer-primitive-check
44
^EXIT=10$
55
^SIGNAL=0$
6-
\[foo.\d+\] line \d+ Check that \*z is assignable: FAILURE$
6+
\[foo.\d+\] line \d+ Check that \*z \(assigned by the contract of bar\) is assignable: FAILURE$
77
^.* 1 of \d+ failed \(\d+ iteration.*\)$
88
^VERIFICATION FAILED$
99
--

regression/contracts/assigns_replace_09/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ main.c
33
--replace-call-with-contract bar --enforce-contract foo
44
^EXIT=0$
55
^SIGNAL=0$
6-
\[foo.\d+\] line \d+ Check that \*z is assignable: SUCCESS$
6+
\[foo.\d+\] line \d+ Check that \*z \(assigned by the contract of bar\) is assignable: SUCCESS$
77
^VERIFICATION SUCCESSFUL$
88
--
99
^Condition: \!not\_found$
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
CORE
2+
main_enforce.c
3+
--enforce-contract resize_vec _ --signed-overflow-check --unsigned-overflow-check --pointer-overflow-check
4+
^VERIFICATION SUCCESSFUL$
5+
^EXIT=0$
6+
^SIGNAL=0$
7+
--
8+
--
9+
Verifies the contract being replaced in `replace.desc`.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#include "vect.h"
2+
3+
int main()
4+
{
5+
vect *v;
6+
size_t incr;
7+
resize_vec(v, incr);
8+
return 0;
9+
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#include "vect.h"
2+
3+
int main()
4+
{
5+
vect *v;
6+
resize_vec_incr10(v);
7+
return 0;
8+
}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
CORE
2+
main_replace.c
3+
--replace-call-with-contract resize_vec --enforce-contract resize_vec_incr10 _ --signed-overflow-check --unsigned-overflow-check --pointer-overflow-check
4+
^\[.*\] .* Check that v->size \(assigned by the contract of resize_vec\) is assignable: SUCCESS
5+
^\[.*\] .* Check that v->arr \(assigned by the contract of resize_vec\) is assignable: FAILURE
6+
^\[.*\] .* Check that POINTER_OBJECT\(\(const void \*\)v->arr\) \(assigned by the contract of resize_vec\) is assignable: FAILURE
7+
^VERIFICATION FAILED$
8+
^EXIT=10$
9+
^SIGNAL=0$
10+
--
11+
--
12+
Shows that when an assigns clause contains targets that are dependent,
13+
in this case, a pointer variable `v->arr` and
14+
the object it points to `__CPROVER_POINTER_OBJECT(v->arr)`, we can correctly
15+
havoc them when replacing the call by the contract.
16+
In this version of the test the inclusion check must fail.
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
#include <assert.h>
2+
#include <stdlib.h>
3+
4+
typedef struct vect
5+
{
6+
char *arr;
7+
size_t size;
8+
} vect;
9+
10+
void resize_vec(vect *v, size_t incr)
11+
// clang-format off
12+
__CPROVER_requires(
13+
__CPROVER_is_fresh(v, sizeof(vect)) &&
14+
0 < v->size && v->size <= __CPROVER_max_malloc_size &&
15+
0 < incr && incr < __CPROVER_max_malloc_size - v->size &&
16+
__CPROVER_is_fresh(v->arr, v->size)
17+
)
18+
__CPROVER_assigns(v->size, v->arr, __CPROVER_POINTER_OBJECT(v->arr))
19+
__CPROVER_ensures(
20+
v->size == __CPROVER_old(v->size) + __CPROVER_old(incr) &&
21+
__CPROVER_is_fresh(v->arr, v->size)
22+
)
23+
// clang-format on
24+
{
25+
free(v->arr);
26+
v->size += incr;
27+
v->arr = malloc(v->size);
28+
return;
29+
}
30+
31+
void resize_vec_incr10(vect *v)
32+
// clang-format off
33+
__CPROVER_requires(
34+
__CPROVER_is_fresh(v, sizeof(vect)) &&
35+
0 < v->size && v->size <= __CPROVER_max_malloc_size &&
36+
v->size + 10 < __CPROVER_max_malloc_size &&
37+
__CPROVER_is_fresh(v->arr, v->size)
38+
)
39+
__CPROVER_assigns(v->size)
40+
__CPROVER_ensures(
41+
v->size == __CPROVER_old(v->size) + 10 &&
42+
__CPROVER_is_fresh(v->arr, v->size)
43+
)
44+
// clang-format on
45+
{
46+
resize_vec(v, 10);
47+
return;
48+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
CORE
2+
main_enforce.c
3+
--enforce-contract resize_vec _ --signed-overflow-check --unsigned-overflow-check --pointer-overflow-check
4+
^VERIFICATION SUCCESSFUL$
5+
^EXIT=0$
6+
^SIGNAL=0$
7+
--
8+
--
9+
Verifies the contract being replaced in `replace.desc`.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#include "vect.h"
2+
3+
int main()
4+
{
5+
vect *v;
6+
size_t incr;
7+
resize_vec(v, incr);
8+
return 0;
9+
}

0 commit comments

Comments
 (0)