Fix apparent bug...

[satcheck.git] / constgen.cc

diff --git a/constgen.cc b/constgen.cc
index 368cb6823d8cce01715fd4723478953b8fbddd3a..ff72bf0b7720848b9620d6ed3dee0a3f47c42d67 100644 (file)
--- a/constgen.cc
+++ b/constgen.cc
@@ -983,7 +983,8 @@ bool ConstGen::orderThread(EPRecord *first, EPRecord *second) {
                EPRecord *join=(*joinvec)[i];
                ExecPoint *jp=join->getEP();
                if (jp->get_tid()==thr2 &&
-                               jp->compare(ep2)==CR_AFTER)
+                               jp->compare(ep2)==CR_AFTER &&
+                               join->getJoinThread() == thr1)
                        return true;
        }
        return false;
@@ -1763,6 +1764,7 @@ void ConstGen::processEquals(EPRecord *record) {
                Constraint *l2=getRetValueEncoding(r, constval);
                Constraint *functionimplication2=new Constraint(IMPLIES, outputtrue, l2);
                ADDCONSTRAINT(functionimplication2,"equalsimpl");
+        return;
        }
 
        IntIterator *iit=record->getSet(VC_BASEINDEX)->iterator();