From 8765dc16a56979286691f12692eb9ca29eb15c73 Mon Sep 17 00:00:00 2001
From: Nikolaj Bjorner <nbjorner@microsoft.com>
Date: Fri, 21 Jan 2022 13:11:53 +0100
Subject: [PATCH] merge

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
---
 src/math/polysat/solver.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/math/polysat/solver.cpp b/src/math/polysat/solver.cpp
index 2a3715f2d..d28d2a7a3 100644
--- a/src/math/polysat/solver.cpp
+++ b/src/math/polysat/solver.cpp
@@ -208,6 +208,8 @@ namespace polysat {
 #endif
         push_qhead();
         while (can_propagate()) {
+            if (is_conflict())
+                return;
             auto const& item = m_search[m_qhead++];
             if (item.is_assignment())
                 propagate(item.var());