Fix apparent bug... master
authorbdemsky <bdemsky@uci.edu>
Sat, 2 Sep 2017 05:09:33 +0000 (22:09 -0700)
committerbdemsky <bdemsky@uci.edu>
Sat, 2 Sep 2017 05:09:33 +0000 (22:09 -0700)
constgen.cc

index 27c17fb..ff72bf0 100644 (file)
@@ -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;