Handle conflicting lifetime markers conservatively.

Avoid infinite looping in AllocaManager::computeInterBlockLiveness,
without using new temporary variables. This also makes it clear that
the algorithm is conservative in the face of conflicting liveness
intrinsics.

1 files changed, 8 insertions, 16 deletions

diff --git a/lib/Target/JSBackend/AllocaManager.cpp b/lib/Target/JSBackend/AllocaManager.cpp
index b49e6c4de1..a77ddc7324 100644
--- a/lib/Target/JSBackend/AllocaManager.cpp
+++ b/lib/Target/JSBackend/AllocaManager.cpp
@@ -249,15 +249,11 @@ void AllocaManager::computeInterBlockLiveness() {
     // If it contains new live blocks, prepare to propagate them.
     if (Temp.test(BLI.LiveIn)) {
       BLI.LiveIn |= Temp;
-      BitVector LiveOut = BLI.LiveOut;
+      Temp.reset(BLI.End);
       BLI.LiveOut |= Temp;
-      BLI.LiveOut.reset(BLI.End);
-      // If we actually added to live-out, re-process them
-      if (BLI.LiveOut.test(LiveOut)) {
-        for (succ_const_iterator SI = succ_begin(BB), SE = succ_end(BB);
-             SI != SE; ++SI) {
-          InterBlockWorklist.insert(*SI);
-        }
+      for (succ_const_iterator SI = succ_begin(BB), SE = succ_end(BB);
+           SI != SE; ++SI) {
+        InterBlockWorklist.insert(*SI);
       }
     }
     Temp.reset();
@@ -272,15 +268,11 @@ void AllocaManager::computeInterBlockLiveness() {
     if (Temp.test(BLI.LiveOut)) {
       // TODO: As above, what are the semantics of a standalone lifetime end?
       BLI.LiveOut |= Temp;
-      BitVector LiveIn = BLI.LiveIn;
+      Temp.reset(BLI.Start);
       BLI.LiveIn |= Temp;
-      BLI.LiveIn.reset(BLI.Start);
-      // If we actually added to live-in, re-process them
-      if (BLI.LiveIn.test(LiveIn)) {
-        for (const_pred_iterator PI = pred_begin(BB), PE = pred_end(BB);
-             PI != PE; ++PI) {
-          InterBlockWorklist.insert(*PI);
-        }
+      for (const_pred_iterator PI = pred_begin(BB), PE = pred_end(BB);
+           PI != PE; ++PI) {
+        InterBlockWorklist.insert(*PI);
       }
     }
     Temp.reset();