model: prune may-read-from set early

[c11tester.git] / action.cc

diff --git a/action.cc b/action.cc
index 13da2b96312f0ee9c524b04fb13f0fcc997697b5..72ca472657e79f370773aae58c414fe645b0890d 100644 (file)
--- a/action.cc
+++ b/action.cc
@@ -31,6 +31,7 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc,
        location(loc),
        value(value),
        reads_from(NULL),
+       reads_from_promise(NULL),
        last_fence_release(NULL),
        node(NULL),
        seq_number(ACTION_INITIAL_CLOCK),
@@ -510,8 +511,10 @@ void ModelAction::print() const
        }
 
        uint64_t valuetoprint;
-       if (type == ATOMIC_READ && reads_from != NULL)
+       if (is_read() && reads_from)
                valuetoprint = reads_from->value;
+       else if (is_read() && reads_from_promise)
+               valuetoprint = reads_from_promise->get_value();
        else
                valuetoprint = value;