From dabf1458cbad8890c6a4c7ade00fd16ce425db2a Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Sun, 20 Oct 2019 21:14:43 +0200
Subject: [PATCH] Kill dead stores.

---
 src/mc/ModelChecker.cpp            |  4 ++--
 src/mc/compare.cpp                 |  1 -
 src/smpi/colls/coll_tuned_topo.cpp | 13 -------------
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/mc/ModelChecker.cpp b/src/mc/ModelChecker.cpp
index 2b1d6d980c..e7ce3d295a 100644
--- a/src/mc/ModelChecker.cpp
+++ b/src/mc/ModelChecker.cpp
@@ -377,8 +377,8 @@ void ModelChecker::handle_simcall(Transition const& transition)
 
 bool ModelChecker::checkDeadlock()
 {
-  int res;
-  if ((res = this->process().get_channel().send(MC_MESSAGE_DEADLOCK_CHECK)))
+  int res = this->process().get_channel().send(MC_MESSAGE_DEADLOCK_CHECK);
+  if (res != 0)
     xbt_die("Could not check deadlock state");
   s_mc_message_int_t message;
   ssize_t s = mc_model_checker->process().get_channel().receive(message);
diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp
index 862bace19b..6416733ec9 100644
--- a/src/mc/compare.cpp
+++ b/src/mc/compare.cpp
@@ -474,7 +474,6 @@ static bool heap_area_differ_without_type(simgrid::mc::StateComparator& state, c
         ssize_t ignore2 = heap_comparison_ignore_size(state.processStates[1].to_ignore, (const char*)real_area2 + i);
         if (ignore2 == ignore1) {
           if (ignore1 == 0) {
-            check_ignore--;
             return false;
           } else {
             i = i + ignore2;
diff --git a/src/smpi/colls/coll_tuned_topo.cpp b/src/smpi/colls/coll_tuned_topo.cpp
index ae0ec44ce7..56d09c8613 100644
--- a/src/smpi/colls/coll_tuned_topo.cpp
+++ b/src/smpi/colls/coll_tuned_topo.cpp
@@ -108,14 +108,6 @@ ompi_coll_tuned_topo_build_tree( int fanout,
       return NULL;
     }
 
-    tree->tree_root     = MPI_UNDEFINED;
-    tree->tree_nextsize = MPI_UNDEFINED;
-
-    /*
-     * Set root
-     */
-    tree->tree_root = root;
-
     /*
      * Initialize tree
      */
@@ -208,9 +200,6 @@ ompi_coll_tuned_topo_build_in_order_bintree( MPI_Comm comm )
       return NULL;
     }
 
-    tree->tree_root     = MPI_UNDEFINED;
-    tree->tree_nextsize = MPI_UNDEFINED;
-
     /*
      * Initialize tree
      */
@@ -503,8 +492,6 @@ ompi_coll_tuned_topo_build_chain( int fanout,
       fflush(stdout);
       return NULL;
     }
-    chain->tree_root     = MPI_UNDEFINED;
-    chain->tree_nextsize = -1;
     for(i=0;i<fanout;i++) chain->tree_next[i] = -1;
 
     /*
-- 
2.20.1