diff --git a/lib/Analysis/LoopInfo.cpp b/lib/Analysis/LoopInfo.cpp
index 1c3d5ee5658..1f8e34ca7e6 100644
--- a/lib/Analysis/LoopInfo.cpp
+++ b/lib/Analysis/LoopInfo.cpp
@@ -147,8 +147,9 @@ BasicBlock *Loop::getLoopPreheader() const {
   BasicBlock *Header = getHeader();
   for (pred_iterator PI = pred_begin(Header), PE = pred_end(Header);
        PI != PE; ++PI)
-    if (!contains(*PI)) { // If the block is not in the loop...
-      if (Out) return 0;  // Multiple predecessors outside the loop
+    if (!contains(*PI)) {     // If the block is not in the loop...
+      if (Out && Out != *PI)
+        return 0;             // Multiple predecessors outside the loop
       Out = *PI;
     }