Fix apparent bug...

diff --git a/constgen.cc b/constgen.cc
index 27c17fb37643b5ffe2ea58ff60bdd7e0600287f1..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;