revert commit

diff --git a/action.cc b/action.cc
index b654a35422a6cb3533a3236159d9048f5ab661a7..473d99f72899f4c0866719b5629767b4053e0c38 100644 (file)
--- a/action.cc
+++ b/action.cc
@@ -40,7 +40,6 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc,
        cv(NULL),
        rf_cv(NULL),
        value(value),
-       reads_from_value(VALUE_NONE),
        type(type),
        order(order),
        original_order(order),
@@ -73,7 +72,6 @@ ModelAction::ModelAction(action_type_t type, memory_order order, uint64_t value,
        cv(NULL),
        rf_cv(NULL),
        value(value),
-        reads_from_value(VALUE_NONE),
        type(type),
        order(order),
        original_order(order),
@@ -105,7 +103,6 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc,
        cv(NULL),
        rf_cv(NULL),
        value(value),
-        reads_from_value(VALUE_NONE),
        type(type),
        order(order),
        original_order(order),
@@ -141,7 +138,6 @@ ModelAction::ModelAction(action_type_t type, const char * position, memory_order
        cv(NULL),
        rf_cv(NULL),
        value(value),
-        reads_from_value(VALUE_NONE),
        type(type),
        order(order),
        original_order(order),
@@ -178,7 +174,6 @@ ModelAction::ModelAction(action_type_t type, const char * position, memory_order
        cv(NULL),
        rf_cv(NULL),
        value(value),
-        reads_from_value(VALUE_NONE),
        type(type),
        order(order),
        original_order(order),
@@ -576,12 +571,8 @@ void ModelAction::set_try_lock(bool obtainedlock)
 uint64_t ModelAction::get_reads_from_value() const
 {
        ASSERT(is_read());
-       if (reads_from) {
-               if (reads_from->is_uninitialized())
-                       return reads_from_value;
-               else
-                       return reads_from->get_write_value();
-       }
+       if (reads_from)
+               return reads_from->get_write_value();
 
        return VALUE_NONE;      // Only for new actions with no reads-from
 }
@@ -637,7 +628,6 @@ void ModelAction::set_read_from(ModelAction *act)
                ModelAction * act_uninitialized = (ModelAction *)act;
                act_uninitialized->set_value(val);
                reads_from = act_uninitialized;
-               reads_from_value = val;
 
 // disabled by WL, because LLVM IR is unable to detect atomic init
 /*             model->assert_bug("May read from uninitialized atomic:\n"

diff --git a/action.h b/action.h
index fafa27cd1f4e68cee555917005f6e06af366c3cc..00289355be9db60dd14c4cec2eace3381ac2e79a 100644 (file)
--- a/action.h
+++ b/action.h
@@ -224,10 +224,6 @@ private:
        /** @brief The value written (for write or RMW; undefined for read) */
        uint64_t value;
 
-       /** @brief The value this action read from (only used when reads_from is an
-        *  uninitialized action)  */
-       uint64_t reads_from_value;
-
        /** @brief Type of action (read, write, RMW, fence, thread create, etc.) */
        action_type type;