Skip to content

CONTRACTS: is_fresh declarations are handled via the symbol table #6574

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.

Sign up for GitHub

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 1 commit into from
Jan 17, 2022
Merged

CONTRACTS: is_fresh declarations are handled via the symbol table #6574

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 14 additions & 15 deletions src/goto-instrument/contracts/memory_predicates.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ Date: July 2021
#include <ansi-c/ansi_c_language.h>
#include <ansi-c/expr2c.h>

#include <goto-programs/goto_convert_functions.h>

#include <linking/static_lifetime_init.h>

#include <util/config.h>
Expand Down Expand Up @@ -188,21 +190,18 @@ void is_fresh_baset::add_declarations(const std::string &decl_string)
}
}

// We have to set the global memory map array to
// all zeros for this to work properly
const array_typet ty =
to_array_type(tmp_symbol_table.lookup_ref(memmap_name).type);
constant_exprt initial_value(irep_idt(dstringt("0")), ty.subtype());
array_of_exprt memmap_init(initial_value, ty);
goto_programt::instructiont a =
goto_programt::make_assignment(symbol_exprt(memmap_name, ty), memmap_init);

// insert the assignment into the initialize function.
auto called_func =
parent.get_goto_functions().function_map.find(INITIALIZE_FUNCTION);
goto_programt &body = called_func->second.body;
auto target = body.get_end_function();
body.insert_before(target, a);
if(parent.get_goto_functions().function_map.erase(INITIALIZE_FUNCTION) != 0)
{
static_lifetime_init(
parent.get_symbol_table(),
parent.get_symbol_table().lookup_ref(INITIALIZE_FUNCTION).location);
goto_convert(
INITIALIZE_FUNCTION,
parent.get_symbol_table(),
parent.get_goto_functions(),
log.get_message_handler());
parent.get_goto_functions().update();
}
Comment on lines +193 to +204
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't that the same as edf6a5c?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1.

May be that PR depends on this one?

}

void is_fresh_baset::update_fn_call(
Expand Down