Skip to content
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

[CONTRACTS] Use fresh converter in loop contracts instrumentation #8282

Merged
merged 1 commit into from
Jun 5, 2024
Merged

[CONTRACTS] Use fresh converter in loop contracts instrumentation #8282

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
19 changes: 19 additions & 0 deletions src/goto-instrument/contracts/contracts.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,8 @@ void code_contractst::check_apply_loop_contracts(
initial_invariant_val, invariant};
initial_invariant_value_assignment.add_source_location() =
loop_head_location;

goto_convertt converter(symbol_table, log.get_message_handler());
converter.goto_convert(
initial_invariant_value_assignment, pre_loop_head_instrs, mode);
}
Expand Down Expand Up @@ -293,6 +295,8 @@ void code_contractst::check_apply_loop_contracts(
assertion.add_source_location() = loop_head_location;
assertion.add_source_location().set_comment(
"Check loop invariant before entry");

goto_convertt converter(symbol_table, log.get_message_handler());
converter.goto_convert(assertion, pre_loop_head_instrs, mode);
}

Expand Down Expand Up @@ -338,6 +342,8 @@ void code_contractst::check_apply_loop_contracts(
{
code_assumet assumption{invariant};
assumption.add_source_location() = loop_head_location;

goto_convertt converter(symbol_table, log.get_message_handler());
converter.goto_convert(assumption, pre_loop_head_instrs, mode);
}

Expand Down Expand Up @@ -393,6 +399,8 @@ void code_contractst::check_apply_loop_contracts(
code_assignt old_decreases_assignment{
old_decreases_vars[i], decreases_clause_exprs[i]};
old_decreases_assignment.add_source_location() = loop_head_location;

goto_convertt converter(symbol_table, log.get_message_handler());
converter.goto_convert(
old_decreases_assignment, pre_loop_head_instrs, mode);
}
Expand Down Expand Up @@ -441,6 +449,8 @@ void code_contractst::check_apply_loop_contracts(
assertion.add_source_location() = loop_head_location;
assertion.add_source_location().set_comment(
"Check that loop invariant is preserved");

goto_convertt converter(symbol_table, log.get_message_handler());
converter.goto_convert(assertion, pre_loop_end_instrs, mode);
}

Expand All @@ -453,6 +463,8 @@ void code_contractst::check_apply_loop_contracts(
code_assignt new_decreases_assignment{
new_decreases_vars[i], decreases_clause_exprs[i]};
new_decreases_assignment.add_source_location() = loop_head_location;

goto_convertt converter(symbol_table, log.get_message_handler());
converter.goto_convert(
new_decreases_assignment, pre_loop_end_instrs, mode);
}
Expand All @@ -465,6 +477,8 @@ void code_contractst::check_apply_loop_contracts(
monotonic_decreasing_assertion.add_source_location() = loop_head_location;
monotonic_decreasing_assertion.add_source_location().set_comment(
"Check decreases clause on loop iteration");

goto_convertt converter(symbol_table, log.get_message_handler());
converter.goto_convert(
monotonic_decreasing_assertion, pre_loop_end_instrs, mode);

Expand Down Expand Up @@ -706,6 +720,7 @@ void code_contractst::apply_function_contract(
.append(" in ")
.append(function.c_str()));
_location.set_property_class(ID_precondition);
goto_convertt converter(symbol_table, log.get_message_handler());
generate_contract_constraints(
symbol_table,
converter,
Expand Down Expand Up @@ -785,6 +800,8 @@ void code_contractst::apply_function_contract(
source_locationt _location = clause.source_location();
_location.set_comment("Assume ensures clause");
_location.set_property_class(ID_assume);

goto_convertt converter(symbol_table, log.get_message_handler());
generate_contract_constraints(
symbol_table,
converter,
Expand Down Expand Up @@ -1355,6 +1372,7 @@ void code_contractst::add_contract_check(
source_locationt _location = clause.source_location();
_location.set_comment("Assume requires clause");
_location.set_property_class(ID_assume);
goto_convertt converter(symbol_table, log.get_message_handler());
generate_contract_constraints(
symbol_table,
converter,
Expand Down Expand Up @@ -1388,6 +1406,7 @@ void code_contractst::add_contract_check(
source_locationt _location = clause.source_location();
_location.set_comment("Check ensures clause");
_location.set_property_class(ID_postcondition);
goto_convertt converter(symbol_table, log.get_message_handler());
generate_contract_constraints(
symbol_table,
converter,
Expand Down
6 changes: 1 addition & 5 deletions src/goto-instrument/contracts/contracts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ Date: February 2016
#ifndef CPROVER_GOTO_INSTRUMENT_CONTRACTS_CONTRACTS_H
#define CPROVER_GOTO_INSTRUMENT_CONTRACTS_CONTRACTS_H

#include <ansi-c/goto-conversion/goto_convert_class.h>

#include <util/message.h>
#include <util/namespace.h>

Expand Down Expand Up @@ -62,8 +60,7 @@ class code_contractst
goto_model(goto_model),
symbol_table(goto_model.symbol_table),
goto_functions(goto_model.goto_functions),
log(log),
converter(symbol_table, log.get_message_handler())
log(log)
{
}

Expand Down Expand Up @@ -150,7 +147,6 @@ class code_contractst
goto_functionst &goto_functions;

messaget &log;
goto_convertt converter;
Copy link
Collaborator

Choose a reason for hiding this comment

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

Please remove #include <ansi-c/goto-conversion/goto_convert_class.h> from this file and move it to the .cpp file.


std::unordered_set<irep_idt> summarized;

Expand Down
Loading