bug fixes

[c11tester.git] / action.cc

diff --git a/action.cc b/action.cc
index 16dcc5cde20afc4f5f3bf7a27d900fba52c5da0e..d90a94ee48211ddb17e9a3f26cafcb4e56ca9e55 100644 (file)
--- a/action.cc
+++ b/action.cc
@@ -38,9 +38,6 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc,
        last_fence_release(NULL),
        cv(NULL),
        rf_cv(NULL),
-       trace_ref(NULL),
-       thrdmap_ref(NULL),
-       action_ref(NULL),
        value(value),
        type(type),
        order(order),
@@ -48,7 +45,7 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc,
        seq_number(ACTION_INITIAL_CLOCK)
 {
        /* References to NULL atomic variables can end up here */
-       ASSERT(loc || type == ATOMIC_FENCE);
+       ASSERT(loc || type == ATOMIC_FENCE || type == ATOMIC_NOP);
 
        Thread *t = thread ? thread : thread_current();
        this->tid = t!= NULL ? t->get_id() : -1;
@@ -72,9 +69,6 @@ ModelAction::ModelAction(action_type_t type, memory_order order, uint64_t value,
        last_fence_release(NULL),
        cv(NULL),
        rf_cv(NULL),
-       trace_ref(NULL),
-       thrdmap_ref(NULL),
-       action_ref(NULL),
        value(value),
        type(type),
        order(order),
@@ -105,9 +99,6 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc,
        last_fence_release(NULL),
        cv(NULL),
        rf_cv(NULL),
-       trace_ref(NULL),
-       thrdmap_ref(NULL),
-       action_ref(NULL),
        value(value),
        type(type),
        order(order),
@@ -142,9 +133,6 @@ ModelAction::ModelAction(action_type_t type, const char * position, memory_order
        last_fence_release(NULL),
        cv(NULL),
        rf_cv(NULL),
-       trace_ref(NULL),
-       thrdmap_ref(NULL),
-       action_ref(NULL),
        value(value),
        type(type),
        order(order),
@@ -180,9 +168,6 @@ ModelAction::ModelAction(action_type_t type, const char * position, memory_order
        last_fence_release(NULL),
        cv(NULL),
        rf_cv(NULL),
-       trace_ref(NULL),
-       thrdmap_ref(NULL),
-       action_ref(NULL),
        value(value),
        type(type),
        order(order),