Skip to content

CONTRACTS: add missing source locations #7850

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
Aug 14, 2023
Merged

CONTRACTS: add missing source locations #7850

Show file tree
Hide file tree
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
20 changes: 10 additions & 10 deletions src/goto-instrument/contracts/dynamic-frames/dfcc_instrument_loop.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,8 @@ dfcc_instrument_loopt::add_prehead_instructions(
{
pre_loop_head_instrs.add(
goto_programt::make_decl(entered_loop, loop_head_location));
pre_loop_head_instrs.add(
goto_programt::make_assignment(entered_loop, false_exprt{}));
pre_loop_head_instrs.add(goto_programt::make_assignment(
entered_loop, false_exprt{}, loop_head_location));
}

// initial_invariant = <loop_invariant>;
Expand All @@ -276,8 +276,8 @@ dfcc_instrument_loopt::add_prehead_instructions(
// in_base_case = true;
pre_loop_head_instrs.add(
goto_programt::make_decl(in_base_case, loop_head_location));
pre_loop_head_instrs.add(
goto_programt::make_assignment(in_base_case, true_exprt{}));
pre_loop_head_instrs.add(goto_programt::make_assignment(
in_base_case, true_exprt{}, loop_head_location));
}

{
Expand Down Expand Up @@ -417,11 +417,11 @@ dfcc_instrument_loopt::add_step_instructions(
loop_head_location);
step_instrs.add(
goto_programt::make_decl(in_loop_havoc_block, loop_head_location));
step_instrs.add(
goto_programt::make_assignment(in_loop_havoc_block, true_exprt{}));
step_instrs.add(goto_programt::make_assignment(
in_loop_havoc_block, true_exprt{}, loop_head_location));
step_instrs.destructive_append(havoc_instrs);
step_instrs.add(
goto_programt::make_assignment(in_loop_havoc_block, false_exprt{}));
step_instrs.add(goto_programt::make_assignment(
in_loop_havoc_block, false_exprt{}, loop_head_location));
}

goto_convertt converter(symbol_table, log.get_message_handler());
Expand Down Expand Up @@ -490,8 +490,8 @@ void dfcc_instrument_loopt::add_body_instructions(

{
// Record that we entered the loop with `entered_loop = true`.
pre_loop_latch_instrs.add(
goto_programt::make_assignment(entered_loop, true_exprt{}));
pre_loop_latch_instrs.add(goto_programt::make_assignment(
entered_loop, true_exprt{}, loop_head_location));
}

{
Expand Down
5 changes: 3 additions & 2 deletions src/goto-instrument/contracts/dynamic-frames/dfcc_spec_functions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ void dfcc_spec_functionst::generate_havoc_instructions(
"__havoc_target",
location);

havoc_program.add(goto_programt::make_decl(target_expr));
havoc_program.add(goto_programt::make_decl(target_expr, location));

call.lhs() = target_expr;
havoc_program.add(goto_programt::make_function_call(call, location));
Expand All @@ -221,7 +221,8 @@ void dfcc_spec_functionst::generate_havoc_instructions(
target_expr, pointer_type(target_type))},
nondet,
location));
auto label = havoc_program.add(goto_programt::make_dead(target_expr));
auto label =
havoc_program.add(goto_programt::make_dead(target_expr, location));
goto_instruction->complete_goto(label);
}
else if(
Expand Down