diff options
| author | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2020-05-19 21:48:01 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-19 21:48:01 -0500 |
| commit | af874a5c7a2ff134da0d4c20d06a0626d3e36d9b (patch) | |
| tree | 16ad9de2b0c5753d2cd4cd3fcdd43bf8fbd55a71 /src/expr/node_algorithm.h | |
| parent | 9712a20e6585728c7d0453e64e1e3b06a7d37b7f (diff) | |
Do not eliminate variables that are equal to unevaluatable terms (#4267)
When we eliminate a variable x -> v during simplification, it may be the case that v contains "unevaluated" operators like forall, choice, etc. Thus, we do not produce correct models for such inputs unless simplification is disabled.
This PR ensures we only eliminate variables when v contains only evaluated operators.
Additionally, the kinds registered as unevaluated were slightly modified so that when we are in a logic like QF_LIA, there are no registered unevaluated operators, hence the check above is unnecessary. This is to minimize the performance impact of this change.
Fixes #4500.
Diffstat (limited to 'src/expr/node_algorithm.h')
| -rw-r--r-- | src/expr/node_algorithm.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/expr/node_algorithm.h b/src/expr/node_algorithm.h index 5e042d591..894dce7c6 100644 --- a/src/expr/node_algorithm.h +++ b/src/expr/node_algorithm.h @@ -52,6 +52,14 @@ bool hasSubtermMulti(TNode n, TNode t); bool hasSubtermKind(Kind k, Node n); /** + * @param ks The kinds of node to check + * @param n The node to search in. + * @return true iff there is a term in n that has any kind ks + */ +bool hasSubtermKinds(const std::unordered_set<Kind, kind::KindHashFunction>& ks, + Node n); + +/** * Check if the node n has a subterm that occurs in t. * @param n The node to search in * @param t The set of subterms to search for |