[gcmole] Fixes for unreachable code

tools/gcmole/gcmole.cc

Index: tools/gcmole/gcmole.cc
diff --git a/tools/gcmole/gcmole.cc b/tools/gcmole/gcmole.cc
index 67f676d667165fe1f3c5baa8f4f5d3ede21d2218..f41484f08e35c0145e5d466d47f97309137b9b4b 100644
--- a/tools/gcmole/gcmole.cc
+++ b/tools/gcmole/gcmole.cc
@@ -348,7 +348,7 @@ class Environment {
   }
 
   bool Equal(const Environment& env) {
-    if (unreachable_) return env.unreachable_;
+    if (unreachable_ && env.unreachable_) return true;
     size_t size = std::max(live_.size(), env.live_.size());
     for (size_t i = 0; i < size; ++i) {
       if (is_live(i) != env.is_live(i)) return false;
@@ -405,7 +405,8 @@ class Environment {
   }
 
   void set_live(size_t pos) {
-    if (live_.size() <= pos) live_.resize(std::max(pos + 1, 2 * live_.size()));
+    if (unreachable_) return;
+    if (pos >= live_.size()) live_.resize(pos + 1);
     live_[pos] = true;
   }
 
@@ -414,19 +415,25 @@ class Environment {
   }
 
   Environment& operator|=(const Environment& o) {
-    unreachable_ |= o.unreachable_;
-    for (size_t i = 0, e = o.live_.size(); i < e; ++i) {
-      if (o.live_[i]) set_live(i);
+    if (o.unreachable_) {
+      unreachable_ = true;
+      live_.clear();
+    } else if (!unreachable_) {
+      for (size_t i = 0, e = o.live_.size(); i < e; ++i) {
+        if (o.live_[i]) set_live(i);
+      }
     }
     return *this;
   }
 
   Environment& operator&=(const Environment& o) {
-    unreachable_ &= o.unreachable_;
-    size_t size = std::min(live_.size(), o.live_.size());
-    if (live_.size() > size) live_.resize(size);
+    if (o.unreachable_) return *this;
+    if (unreachable_) return *this = o;
+
+    size_t size = std::max(live_.size(), o.live_.size());

[Vyacheslav Egorov (Google), 2017/02/16 11:53:00]

I think now that unreachable is handled above it would be correctly to use
min(...) here and < below because whichever of two (|this| or |o|) is longer its
gonna be conjugated with the tail of the smaller one which is all false and
disappear. 
 

[Clemens Hammacher, 2017/02/16 12:02:26]

What if |o| > |this| and the tail of o is all false. Wouldn't we want to resize
|o| to also contain those false values?
I think that's relevant for the Equals operator in the case that one in
unreachable and the other is not. We need to distinguish between false values
and non-existing values, no?

[Vyacheslav Egorov (Google), 2017/02/16 12:17:31]

I see what you mean. Yeah, this subtle. Might warrant a comment here.

[Clemens Hammacher, 2017/02/16 13:13:04]

Added comment.

+    if (size > live_.size()) live_.resize(size);
     for (size_t i = 0; i < size; ++i) {
-      if (live_[i] && (i > o.live_.size() || !o.live_[i])) live_[i] = false;
+      if (live_[i] && (i >= o.live_.size() || !o.live_[i])) live_[i] = false;

[Vyacheslav Egorov (Google), 2017/02/16 11:53:00]

this should just be 

live_[i] = live_[i] && o.live_[i] 

because size would be the minimum of sizes. 

     }
     return *this;
   }
@@ -435,6 +442,8 @@ class Environment {
   static std::vector<Environment*> envs_;
 
   std::vector<bool> live_;
+  // unreachable_ == true implies live_.empty(), but still is_live(i) returns
+  // true for all i.
   bool unreachable_ = false;
 
   friend class ExprEffect;