action, model: add ASSERT(), not NULL checks

These should never be called with NULL. Don't make them a real
conditional.

diff --git a/action.cc b/action.cc
index 81f447a5b13f9d8e3db3e352e4be49f4659559b0..0a6a1dd26665a6d553b4e0b7c258f519330bba56 100644 (file)
--- a/action.cc
+++ b/action.cc
@@ -392,9 +392,10 @@ Node * ModelAction::get_node() const
  */
 void ModelAction::set_read_from(const ModelAction *act)
 {
+       ASSERT(act);
        reads_from = act;
        reads_from_promise = NULL;
-       if (act && act->is_uninitialized())
+       if (act->is_uninitialized())
                model->assert_bug("May read from uninitialized atomic\n");
 }
 

diff --git a/model.cc b/model.cc
index 9ebc85344cd8c4343349a4d7df21e9d034915edc..b10a841a3fdece2304fe405dfcf02de1c6856400 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -1324,8 +1324,9 @@ bool ModelChecker::initialize_curr_action(ModelAction **curr)
  */
 bool ModelChecker::read_from(ModelAction *act, const ModelAction *rf)
 {
+       ASSERT(rf);
        act->set_read_from(rf);
-       if (rf != NULL && act->is_acquire()) {
+       if (act->is_acquire()) {
                rel_heads_list_t release_heads;
                get_release_seq_heads(act, act, &release_heads);
                int num_heads = release_heads.size();