Skip to content

Introduce binding_exprt::instantiate #6192

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
merged 2 commits into from
Jun 21, 2021
Merged

Introduce binding_exprt::instantiate #6192

merged 2 commits into from
Jun 21, 2021

Conversation

kroening
Copy link
Member

  • Each commit message has a non-empty body, explaining why the change was made.
  • 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.

@kroening kroening force-pushed the binding_instantiate branch from f4ede69 to ff7b7d9 Compare June 19, 2021 19:39
@codecov
Copy link

codecov bot commented Jun 19, 2021

Codecov Report

Merging #6192 (e3d8334) into develop (0002950) will increase coverage by 7.75%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #6192      +/-   ##
===========================================
+ Coverage    67.40%   75.16%   +7.75%     
===========================================
  Files         1157     1456     +299     
  Lines        95236   161128   +65892     
===========================================
+ Hits         64197   121107   +56910     
- Misses       31039    40021    +8982     
Flag Coverage Δ
cproversmt2 ?
regression ?
unit ?

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
src/util/mathematical_expr.cpp 50.00% <0.00%> (-50.00%) ⬇️
src/util/string_container.cpp 52.94% <0.00%> (-47.06%) ⬇️
src/solvers/prop/prop.cpp 42.85% <0.00%> (-41.76%) ⬇️
src/solvers/flattening/boolbv_member.cpp 53.65% <0.00%> (-38.65%) ⬇️
src/cpp/cpp_storage_spec.cpp 65.00% <0.00%> (-35.00%) ⬇️
src/util/cmdline.h 66.66% <0.00%> (-33.34%) ⬇️
src/solvers/strings/array_pool.h 66.66% <0.00%> (-33.34%) ⬇️
src/solvers/strings/string_refinement.h 66.66% <0.00%> (-33.34%) ⬇️
...rs/strings/string_concatenation_builtin_function.h 0.00% <0.00%> (-33.34%) ⬇️
src/cbmc/c_test_input_generator.cpp 60.00% <0.00%> (-30.33%) ⬇️
... and 1435 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3509cc3...e3d8334. Read the comment docs.

@kroening kroening marked this pull request as ready for review June 20, 2021 07:33
value_map[variables[i]] = values[i];
}

// build a subsitution map
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
// build a subsitution map
// build a substitution map

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed


static optionalt<exprt> substitute_symbols_rec(
const std::map<irep_idt, exprt> &substitutions,
exprt src)
Copy link
Member

Choose a reason for hiding this comment

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

Is it necessary to pass by value here (a copy is taken below)?

Copy link
Member Author

Choose a reason for hiding this comment

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

The copy happens in most cases -- so this is the pattern "use pass by value when copy is inevitable".

kroening added 2 commits June 20, 2021 22:06
This introduces a helper method to substitute variables that are bound in a
binding_exprt by a vector of given values.  The substitution algorithm
preserves sharing when no substitution is made and is aware of hiding when
nesting bindings.
lambda_exprt uses a binding_exprt, which means that the application of a
function given as lambda expression is a special case of an instantiation.
@kroening kroening force-pushed the binding_instantiate branch from ff7b7d9 to e3d8334 Compare June 20, 2021 21:08
@kroening kroening merged commit f9be0eb into develop Jun 21, 2021
@kroening kroening deleted the binding_instantiate branch June 21, 2021 08:37
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.

3 participants