Skip to content

Remove preprocessing that was using ID_cprover_string_concat_bool_func #3448

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.

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

Conversation

romainbrenguier
Copy link
Contributor

@romainbrenguier romainbrenguier commented Nov 20, 2018

This builtin function is not handled by the solver, so preprocessing functions
and producing ID_cprover_string_concat_bool_func could only lead to
errors.
Instead we use models of these functions given in the java-models-library (updated with this PR to include these models).

3719036

  • Each commit message has a non-empty body, explaining why the change was made.
  • [na] Methods or procedures I have added are documented, following the guidelines provided in CODING_STANDARD.md.
  • 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).
  • [na] My commit message includes data points confirming performance improvements (if claimed).
  • My PR is restricted to a single feature or bugfix.
  • [na] White-space or formatting changes outside the feature-related changed lines are in commits of their own.

This function is not handled by the solver, so preprocessing functions
and producing ID_cprover_string_concat_bool_func could only lead to
errors.
It should rather be using models of these functions given in java
classes.
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: 3719036).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/92000703

@tautschnig tautschnig merged commit 9706f53 into diffblue:develop Nov 20, 2018
@romainbrenguier
Copy link
Contributor Author

this was merged a bit too quickly because the corresponding submodule is not merged on master yet diffblue/java-models-library#14 ; I should have added a "do not merge" label...

@allredj
Copy link
Contributor

allredj commented Nov 20, 2018

DO NOT DELETE THE REMAINING BRANCH!

@tautschnig
Copy link
Collaborator

Apologies for the overly eager merge. But also there is a problem with the workflow here. If all tests pass, including the TG bot, but still a merge is not indicated, then there isn't sufficient testing in place.

@romainbrenguier
Copy link
Contributor Author

Here a new PR to update to the merge on master #3449

@tautschnig
Copy link
Collaborator

So the rules should be:

  1. Don't create a PR if the submodule has not been merged yet or
  2. If you want a PR, e.g., for testing purposes, mark it as "do not merge" until the submodule pointer is to a commit in master?

@romainbrenguier
Copy link
Contributor Author

@tautschnig we do want PRs for the submodule to make sure we are not breaking CI on cbmc, so we should go for option 2

@romainbrenguier
Copy link
Contributor Author

anyway, as long as the java-models-library branch is not deleted, nothing bad should happen

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants