Skip to content

Construct equal_exprt in a non-deprecated way #3776

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

Jump to bottom
Merged
merged 1 commit into from
Jan 14, 2019
Merged

Construct equal_exprt in a non-deprecated way #3776

merged 1 commit into from
Jan 14, 2019

Conversation

tautschnig
Copy link
Collaborator

The default constructor is deprecated.

  • Each commit message has a non-empty body, explaining why the change was made.
  • n/a Methods or procedures I have added are documented, following the guidelines provided in CODING_STANDARD.md.
  • n/a The feature or user visible behaviour I have added or modified has been documented in the User Guide in doc/cprover-manual/
  • Regression or unit tests are included, or existing tests cover the modified code (in this case I have detailed which ones those are in the commit message).
  • n/a My commit message includes data points confirming performance improvements (if claimed).
  • My PR is restricted to a single feature or bugfix.
  • n/a White-space or formatting changes outside the feature-related changed lines are in commits of their own.

@tautschnig tautschnig force-pushed the deprecation-equal_exprt branch from d9ce402 to 49b4c89 Compare January 13, 2019 09:46
allredj
allredj reviewed Jan 13, 2019
View reviewed changes
Copy link
Contributor

@allredj allredj left a comment

Choose a reason for hiding this comment

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

✔️
Passed Diffblue compatibility checks (cbmc commit: 49b4c89).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/97157310

peterschrammel
peterschrammel approved these changes Jan 13, 2019
View reviewed changes
src/ansi-c/c_typecheck_expr.cpp
equal_exprt equality_expr;
equality_expr.operands()=expr.arguments();
equal_exprt equality_expr(
expr.arguments().front(), expr.arguments().back());
Copy link
Member

Choose a reason for hiding this comment

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

Are we sure this has two elements?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

That's check 7 lines earlier so this should be ok.

src/solvers/flattening/boolbv_byte_extract.cpp Outdated
equal_exprt equality;
equality.lhs() = expr.offset(); // index operand
// index operand
equal_exprt equality(expr.offset(), exprt());
Copy link
Member

Choose a reason for hiding this comment

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

Add a comment that rhs will be set below.

src/solvers/flattening/boolbv_byte_extract.cpp Outdated
@@ -170,8 +170,8 @@ bvt boolbvt::convert_byte_extract(const byte_extract_exprt &expr)
}
else
{
equal_exprt equality;
equality.lhs() = expr.offset(); // index operand
// index operand
Copy link
Member

Choose a reason for hiding this comment

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

Add a comment that rhs will be set below.

src/solvers/flattening/boolbv_index.cpp Outdated
equal_exprt index_equality;
index_equality.lhs()=index; // index operand
// index operand
equal_exprt index_equality(index, exprt());
Copy link
Member

Choose a reason for hiding this comment

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

Add a comment that rhs will be set below.

src/solvers/flattening/boolbv_index.cpp Outdated
equal_exprt index_equality;
index_equality.lhs()=index; // index operand
// index operand
equal_exprt index_equality(index, exprt());
Copy link
Member

Choose a reason for hiding this comment

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

I'm wondering whether it wouldn't be better to construct the equality on conversion?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I've now done so, for all the cases that you pointed out.

@peterschrammel peterschrammel removed their assignment Jan 13, 2019
@tautschnig tautschnig force-pushed the deprecation-equal_exprt branch from 49b4c89 to a8a97fe Compare January 14, 2019 16:03
@tautschnig
Construct equal_exprt in a non-deprecated way
5f0367c 
The default constructor is deprecated.
@tautschnig tautschnig force-pushed the deprecation-equal_exprt branch from a8a97fe to 5f0367c Compare January 14, 2019 16:20
allredj
allredj reviewed Jan 14, 2019
View reviewed changes
Copy link
Contributor

@allredj allredj left a comment

Choose a reason for hiding this comment

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

✔️
Passed Diffblue compatibility checks (cbmc commit: 5f0367c).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/97280227

@tautschnig tautschnig merged commit aba13ad into diffblue:develop Jan 14, 2019
@tautschnig tautschnig deleted the deprecation-equal_exprt branch January 14, 2019 19:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@allredj allredj allredj left review comments

@kroening kroening kroening approved these changes

@peterschrammel peterschrammel peterschrammel approved these changes

@chrisr-diffblue chrisr-diffblue Awaiting requested review from chrisr-diffblue

@martin-cs martin-cs Awaiting requested review from martin-cs martin-cs is a code owner

@pkesseli pkesseli Awaiting requested review from pkesseli

@smowton smowton Awaiting requested review from smowton

@thk123 thk123 Awaiting requested review from thk123

Assignees

@chrisr-diffblue chrisr-diffblue

Labels
cleanup
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@tautschnig @kroening @peterschrammel @allredj @chrisr-diffblue