Using a for loop to prune writes that violate modification order is wrong

[c11tester.git] / execution.cc

diff --git a/execution.cc b/execution.cc
index 21207fefcb273a0bc0e4ab4a7b5fa4272691d71a..377cd01cf602899e02a817044f6d6e8e2ccc287a 100644 (file)
--- a/execution.cc
+++ b/execution.cc
@@ -288,12 +288,14 @@ bool ModelExecution::process_read(ModelAction *curr, SnapVector<ModelAction *> *
        }
 
        // Remove writes that violate read modification order
-       for (uint i = 0; i < rf_set->size(); i++) {
+       uint i = 0;
+       while (i < rf_set->size()) {
                ModelAction * rf = (*rf_set)[i];
                if (!r_modification_order(curr, rf, NULL, NULL, true)) {
                        (*rf_set)[i] = rf_set->back();
                        rf_set->pop_back();
-               }
+               } else
+                       i++;
        }
 
        while(true) {
@@ -318,6 +320,9 @@ bool ModelExecution::process_read(ModelAction *curr, SnapVector<ModelAction *> *
                        }
                        return true;
                }
+
+               ASSERT(false);
+               /* Following code not needed anymore */
                priorset->clear();
                (*rf_set)[index] = rf_set->back();
                rf_set->pop_back();