From ea16f9a5121a4e58881a88c0d29fca9138e72464 Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Thu, 6 Dec 2012 22:45:23 -0800 Subject: [PATCH] model: remove old "uninitialized" bug check The previously-existing bug check is not fully correct and has been replaced with explicit UNINIT actions that, when read from, trigger a bug assertion. --- model.cc | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/model.cc b/model.cc index a5b06dd..1499d12 100644 --- a/model.cc +++ b/model.cc @@ -2462,16 +2462,8 @@ void ModelChecker::build_reads_from_past(ModelAction *curr) ModelAction *last_sc_write = NULL; - /* Track whether this object has been initialized */ - bool initialized = false; - - if (curr->is_seqcst()) { + if (curr->is_seqcst()) last_sc_write = get_last_seq_cst_write(curr); - /* We have to at least see the last sequentially consistent write, - so we are initialized. */ - if (last_sc_write != NULL) - initialized = true; - } /* Iterate over all threads */ for (i = 0; i < thrd_lists->size(); i++) { @@ -2503,17 +2495,12 @@ void ModelChecker::build_reads_from_past(ModelAction *curr) } /* Include at most one act per-thread that "happens before" curr */ - if (act->happens_before(curr)) { - initialized = true; + if (act->happens_before(curr)) break; - } } } - if (!initialized) - assert_bug("May read from uninitialized atomic"); - - if (DBG_ENABLED() || !initialized) { + if (DBG_ENABLED()) { model_print("Reached read action:\n"); curr->print(); model_print("Printing may_read_from\n"); -- 2.34.1