Skip to content

Fix _Bool preincrement #7049

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 3, 2022
Merged

Fix _Bool preincrement #7049

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
2 changes: 1 addition & 1 deletion regression/cbmc/Bool/bool6.desc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
KNOWNBUG
CORE
bool6.c

^EXIT=0$
Expand Down
24 changes: 20 additions & 4 deletions src/goto-programs/goto_convert_side_effect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,24 +223,40 @@ void goto_convertt::remove_pre(
op, statement == ID_preincrement ? ID_plus : ID_minus, std::move(constant)};
rhs.add_source_location() = expr.source_location();

// Is there a typecast, e.g., for _Bool? If so, transform
// t1(op : t2) := op+1 --> op := t2(op+1)
exprt lhs;
if(op.id() == ID_typecast)
{
lhs = to_typecast_expr(op).op();
rhs = typecast_exprt(rhs, lhs.type());
}
else
{
lhs = op;
}

const bool cannot_use_lhs =
result_is_used && !address_taken && needs_cleaning(op);
result_is_used && !address_taken && needs_cleaning(lhs);
if(cannot_use_lhs)
make_temp_symbol(rhs, "pre", dest, mode);

code_assignt assignment(op, rhs);
code_assignt assignment(lhs, rhs);
assignment.add_source_location()=expr.find_source_location();

convert(assignment, dest, mode);

if(result_is_used)
{
if(cannot_use_lhs)
expr.swap(rhs);
{
auto tmp = typecast_exprt::conditional_cast(rhs, expr.type());
expr.swap(tmp);
}
else
{
// revert to argument of pre-inc/pre-dec
exprt tmp = op;
auto tmp = typecast_exprt::conditional_cast(lhs, expr.type());
expr.swap(tmp);
}
}
Expand Down