Skip to content

Commit cac8026

Browse files
Add recursive initialisation of structs
Recursively initialise non-deterministically struct components and pointers. Co-authored-by: Fotis Koutoulakis <fotis.koutoulakis@diffblue.com> Co-authored-by: Hannes Steffenhagen <hannes.steffenhagen@diffblue.com>
1 parent 068a306 commit cac8026

File tree

13 files changed

+340
-1
lines changed

13 files changed

+340
-1
lines changed
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#include <assert.h>
2+
#include <stdlib.h>
3+
4+
typedef struct st1
5+
{
6+
struct st2 *to_st2;
7+
int data;
8+
} st1_t;
9+
10+
typedef struct st2
11+
{
12+
struct st1 *to_st1;
13+
int data;
14+
} st2_t;
15+
16+
st1_t dummy1;
17+
st2_t dummy2;
18+
19+
void func(st1_t *p)
20+
{
21+
assert(p != NULL);
22+
assert(p->to_st2 != NULL);
23+
assert(p->to_st2->to_st1 != NULL);
24+
assert(p->to_st2->to_st1->to_st2 == NULL);
25+
26+
assert(p != &dummy1);
27+
assert(p->to_st2 != &dummy2);
28+
assert(p->to_st2->to_st1 != &dummy1);
29+
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
CORE
2+
main.c
3+
--function func --min-null-tree-depth 10 --max-nondet-tree-depth 3 --harness-type call-function
4+
^EXIT=0$
5+
^SIGNAL=0$
6+
VERIFICATION SUCCESSFUL
7+
--
8+
^warning: ignoring
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#include <assert.h>
2+
#include <stdlib.h>
3+
4+
typedef struct st
5+
{
6+
int data;
7+
} st_t;
8+
9+
st_t dummy;
10+
11+
void func(st_t *p)
12+
{
13+
assert(p != NULL);
14+
assert(p != &dummy);
15+
assert(p->data >= 4854549);
16+
assert(p->data < 4854549);
17+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
CORE
2+
main.c
3+
--function func --min-null-tree-depth 10 --harness-type call-function
4+
^EXIT=10$
5+
^SIGNAL=0$
6+
\[func.assertion.1\] line [0-9]+ assertion p != .*((NULL)|0).*: SUCCESS
7+
\[func.assertion.2\] line [0-9]+ assertion p != &dummy: SUCCESS
8+
\[func.assertion.3\] line [0-9]+ assertion p->data >= 4854549: FAILURE
9+
\[func.assertion.4\] line [0-9]+ assertion p->data < 4854549: FAILURE
10+
--
11+
^warning: ignoring
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#include <assert.h>
2+
#include <stdlib.h>
3+
4+
typedef struct st
5+
{
6+
struct st *next;
7+
struct st *prev;
8+
int data;
9+
} st_t;
10+
11+
st_t dummy;
12+
13+
void func(st_t *p)
14+
{
15+
assert(p != NULL);
16+
assert(p != &dummy);
17+
18+
assert(p->prev != NULL);
19+
assert(p->prev != &dummy);
20+
21+
assert(p->next != NULL);
22+
assert(p->next != &dummy);
23+
24+
assert(p->prev->prev == NULL);
25+
assert(p->prev->next == NULL);
26+
assert(p->next->prev == NULL);
27+
assert(p->next->next == NULL);
28+
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
CORE
2+
main.c
3+
--function func --min-null-tree-depth 10 --max-nondet-tree-depth 2 --harness-type call-function
4+
^EXIT=0$
5+
^SIGNAL=0$
6+
VERIFICATION SUCCESSFUL
7+
--
8+
^warning: ignoring
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#include <assert.h>
2+
#include <stdlib.h>
3+
4+
typedef struct st
5+
{
6+
struct st *next;
7+
int data;
8+
} st_t;
9+
10+
st_t dummy;
11+
12+
void func(st_t *p)
13+
{
14+
assert(p != NULL);
15+
assert(p->next != NULL);
16+
assert(p->next->next != NULL);
17+
assert(p->next->next->next == NULL);
18+
19+
assert(p != &dummy);
20+
assert(p->next != &dummy);
21+
assert(p->next->next != &dummy);
22+
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
CORE
2+
main.c
3+
--function func --min-null-tree-depth 10 --max-nondet-tree-depth 3 --harness-type call-function
4+
^EXIT=0$
5+
^SIGNAL=0$
6+
VERIFICATION SUCCESSFUL
7+
--
8+
^warning: ignoring

src/goto-harness/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ SRC = \
44
goto_harness_generator_factory.cpp \
55
goto_harness_main.cpp \
66
goto_harness_parse_options.cpp \
7+
recursive_initialization.cpp \
78
# Empty last line
89

910
OBJ += \

src/goto-harness/function_call_harness_generator.cpp

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Author: Diffblue Ltd.
1919

2020
#include "function_harness_generator_options.h"
2121
#include "goto_harness_parse_options.h"
22+
#include "recursive_initialization.h"
2223

2324
/// This contains implementation details of
2425
/// function call harness generator to avoid
@@ -33,6 +34,9 @@ struct function_call_harness_generatort::implt
3334
goto_functionst *goto_functions;
3435
bool nondet_globals = false;
3536

37+
recursive_initialization_configt recursive_initialization_config;
38+
std::unique_ptr<recursive_initializationt> recursive_initialization;
39+
3640
/// \see goto_harness_generatort::generate
3741
void generate(goto_modelt &goto_model, const irep_idt &harness_function_name);
3842
/// Iterate over the symbol table and generate initialisation code for
@@ -72,6 +76,18 @@ void function_call_harness_generatort::handle_option(
7276
{
7377
p_impl->nondet_globals = true;
7478
}
79+
else if(option == FUNCTION_HARNESS_GENERATOR_MIN_NULL_TREE_DEPTH_OPT)
80+
{
81+
auto const value = require_exactly_one_value(option, values);
82+
p_impl->recursive_initialization_config.min_null_tree_depth =
83+
std::stoul(value);
84+
}
85+
else if(option == FUNCTION_HARNESS_GENERATOR_MAX_NONDET_TREE_DEPTH_OPT)
86+
{
87+
auto const value = require_exactly_one_value(option, values);
88+
p_impl->recursive_initialization_config.max_nondet_tree_depth =
89+
std::stoul(value);
90+
}
7591
else
7692
{
7793
throw invalid_command_line_argument_exceptiont{
@@ -123,6 +139,10 @@ void function_call_harness_generatort::implt::generate(
123139
{
124140
symbol_table = &goto_model.symbol_table;
125141
goto_functions = &goto_model.goto_functions;
142+
const auto &function_to_call = lookup_function_to_call();
143+
recursive_initialization_config.mode = function_to_call.mode;
144+
recursive_initialization = util_make_unique<recursive_initializationt>(
145+
recursive_initialization_config, goto_model);
126146
this->harness_function_name = harness_function_name;
127147
ensure_harness_does_not_already_exist();
128148

@@ -156,7 +176,7 @@ void function_call_harness_generatort::implt::generate_initialisation_code_for(
156176
code_blockt &block,
157177
const exprt &lhs)
158178
{
159-
block.add(code_assignt{lhs, side_effect_expr_nondett{lhs.type()}});
179+
recursive_initialization->initialize(lhs, 0, block);
160180
}
161181

162182
void function_call_harness_generatort::validate_options()

0 commit comments

Comments
 (0)