Skip to content

Ensure consistent type renaming of heap objects of dynamic size #2114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 25, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions regression/cbmc-concurrency/malloc2/main.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#include <stdlib.h>
#include <pthread.h>

_Bool set_done;
int *ptr;

void *set_x(void *arg)
{
*(int *)arg = 10;
set_done = 1;
}

int main(int argc, char *argv[])
{
__CPROVER_assume(argc >= sizeof(int));
ptr = malloc(argc);
__CPROVER_ASYNC_1: set_x(ptr);
__CPROVER_assume(set_done);
assert(*ptr == 10);
return 0;
}
8 changes: 8 additions & 0 deletions regression/cbmc-concurrency/malloc2/test.desc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
CORE
main.c

^EXIT=0$
^SIGNAL=0$
^VERIFICATION SUCCESSFUL$
--
^warning: ignoring
3 changes: 1 addition & 2 deletions src/ansi-c/c_typecheck_type.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -581,10 +581,9 @@ void c_typecheck_baset::typecheck_array_type(array_typet &type)
new_symbol.base_name=id2string(current_symbol.base_name)+suffix;
new_symbol.type=size.type();
new_symbol.type.set(ID_C_constant, true);
new_symbol.is_type=false;
new_symbol.is_static_lifetime=false;
new_symbol.value=size;
new_symbol.location=source_location;
new_symbol.mode = mode;

symbol_table.add(new_symbol);

Expand Down
5 changes: 3 additions & 2 deletions src/goto-symex/symex_builtin_functions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,15 @@ void goto_symext::symex_allocate(
{
exprt &size=to_array_type(object_type).size();

symbolt size_symbol;
auxiliary_symbolt size_symbol;

size_symbol.base_name=
"dynamic_object_size"+std::to_string(dynamic_counter);
size_symbol.name="symex_dynamic::"+id2string(size_symbol.base_name);
size_symbol.is_lvalue=true;
size_symbol.type=tmp_size.type();
size_symbol.mode = mode;
size_symbol.type.set(ID_C_constant, true);
size_symbol.value = size;

state.symbol_table.add(size_symbol);

Expand Down