summaryrefslogtreecommitdiff
path: root/src/theory/arrays/theory_arrays.h
diff options
context:
space:
mode:
authorAndrew Reynolds <andrew.j.reynolds@gmail.com>2020-08-21 17:53:46 -0500
committerGitHub <noreply@github.com>2020-08-21 15:53:46 -0700
commit9ea213066b989a8154b1ebd40ebea3bc7e18c42d (patch)
treec4179264e0f6407d161fc1187a6e2d0c3110a278 /src/theory/arrays/theory_arrays.h
parent05c6ae0bda064083efb7941e1ceb0869cb1b1090 (diff)
Limit trigger terms to shared terms in arrays (#4932)
There is a non-standard use of trigger terms in the array theory via `EqualityEngine::addTriggerTerm`. Trigger terms are only supposed to be shared terms, and are added to the equality engine for the sake of propagating equalities between shared terms. The array theory does two non-standard things: (1) it registers (possibly) non-shared terms as triggers in its `preRegisterInternal` method, (2) it filters propagations between anything except non-shared arrays in its `eqNotifyTriggerTermEquality` method. The latter is only necessary because of the former. It is unnecessary to do *either* of these things. Instead, the array theory should simply add the terms to the equality engine (as non-triggers) during preRegisterInternal. Note that it additionally correctly adds trigger terms in its `notifySharedTerm` method. With this commit, the array theory uses the equality engine (wrt propagation) in a standard way.
Diffstat (limited to 'src/theory/arrays/theory_arrays.h')
-rw-r--r--src/theory/arrays/theory_arrays.h14
1 files changed, 1 insertions, 13 deletions
diff --git a/src/theory/arrays/theory_arrays.h b/src/theory/arrays/theory_arrays.h
index 24ebb4916..a1fa19631 100644
--- a/src/theory/arrays/theory_arrays.h
+++ b/src/theory/arrays/theory_arrays.h
@@ -317,22 +317,10 @@ class TheoryArrays : public Theory {
{
Debug("arrays::propagate") << spaces(d_arrays.getSatContext()->getLevel()) << "NotifyClass::eqNotifyTriggerTermEquality(" << t1 << ", " << t2 << ", " << (value ? "true" : "false") << ")" << std::endl;
if (value) {
- if (t1.getType().isArray()) {
- if (!d_arrays.isShared(t1) || !d_arrays.isShared(t2)) {
- return true;
- }
- }
// Propagate equality between shared terms
return d_arrays.propagateLit(t1.eqNode(t2));
- } else {
- if (t1.getType().isArray()) {
- if (!d_arrays.isShared(t1) || !d_arrays.isShared(t2)) {
- return true;
- }
- }
- return d_arrays.propagateLit(t1.eqNode(t2).notNode());
}
- return true;
+ return d_arrays.propagateLit(t1.eqNode(t2).notNode());
}
void eqNotifyConstantTermMerge(TNode t1, TNode t2) override
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback