Reverting r215966, r215965, r215964, r215963, r215960, r215959, r215958, and r215957...

[oota-llvm.git] / lib / Analysis / ScalarEvolution.cpp

diff --git a/lib/Analysis/ScalarEvolution.cpp b/lib/Analysis/ScalarEvolution.cpp
index fd5b86b4634bb0e97ef9f712c0b94abde393fc6c..06dbde58c1084488ae087b9efbc0633394c0c11e 100644 (file)
--- a/lib/Analysis/ScalarEvolution.cpp
+++ b/lib/Analysis/ScalarEvolution.cpp
@@ -4512,12 +4512,13 @@ ScalarEvolution::ComputeExitLimit(const Loop *L, BasicBlock *ExitingBlock) {
   // lead to the loop header.
   bool MustExecuteLoopHeader = true;
   BasicBlock *Exit = nullptr;
-  for (BasicBlock *Succ : successors(ExitingBlock))
-    if (!L->contains(Succ)) {
+  for (succ_iterator SI = succ_begin(ExitingBlock), SE = succ_end(ExitingBlock);
+       SI != SE; ++SI)
+    if (!L->contains(*SI)) {
       if (Exit) // Multiple exit successors.
         return getCouldNotCompute();
-      Exit = Succ;
-    } else if (Succ != L->getHeader()) {
+      Exit = *SI;
+    } else if (*SI != L->getHeader()) {
       MustExecuteLoopHeader = false;
     }