summaryrefslogtreecommitdiff
path: root/src/theory/strings/eager_solver.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/theory/strings/eager_solver.cpp')
-rw-r--r--src/theory/strings/eager_solver.cpp11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/theory/strings/eager_solver.cpp b/src/theory/strings/eager_solver.cpp
index 1bd317e04..ce47ff4fc 100644
--- a/src/theory/strings/eager_solver.cpp
+++ b/src/theory/strings/eager_solver.cpp
@@ -79,15 +79,10 @@ void EagerSolver::eqNotifyNewClass(TNode t)
}
}
-void EagerSolver::eqNotifyMerge(TNode t1, TNode t2)
+void EagerSolver::eqNotifyMerge(EqcInfo* e1, TNode t1, EqcInfo* e2, TNode t2)
{
- EqcInfo* e2 = d_state.getOrMakeEqcInfo(t2, false);
- if (e2 == nullptr)
- {
- return;
- }
- // always create it if e2 was non-null
- EqcInfo* e1 = d_state.getOrMakeEqcInfo(t1);
+ Assert(e1 != nullptr);
+ Assert(e2 != nullptr);
// check for conflict
Node conf = checkForMergeConflict(t1, t2, e1, e2);
if (!conf.isNull())
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback