diff --git a/lib/Analysis/ScalarEvolution.cpp b/lib/Analysis/ScalarEvolution.cpp
index 2356412b5ac..5701dec4b21 100644
--- a/lib/Analysis/ScalarEvolution.cpp
+++ b/lib/Analysis/ScalarEvolution.cpp
@@ -376,6 +376,7 @@ static void GroupByComplexity(std::vector<SCEVHandle> &Ops) {
         // Move it to immediately after i'th element.
         std::swap(Ops[i+1], Ops[j]);
         ++i;   // no need to rescan it.
+        if (i == e-2) return;  // Done!
       }
     }
   }