fix merge issue

diff --git a/datarace.h b/datarace.h
index c78f5a424929d89d3cedc805006f1b401790a211..2de2a3390759f6dafbc24aba83e4b42e0024117e 100644 (file)
--- a/datarace.h
+++ b/datarace.h
@@ -46,7 +46,6 @@ void initRaceDetector();
 void raceCheckWrite(thread_id_t thread, void *location);
 void raceCheckRead(thread_id_t thread, const void *location);
 void recordWrite(thread_id_t thread, void *location);
-bool checkDataRaces();
 void assert_race(struct DataRace *race);
 bool hasNonAtomicStore(const void *location);
 void setAtomicStoreFlag(const void *location);

diff --git a/model.cc b/model.cc
index 17cba12a4e999986c775ac9fba8ff605913e8aa2..cfbc3b8606243e1cf558a1e7a2a48d0bd3c70967 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -266,7 +266,6 @@ bool ModelChecker::next_execution()
                if (execution->is_deadlocked())
                        assert_bug("Deadlock detected");
 
-               checkDataRaces();
                run_trace_analyses();
        }