diff --git a/include/llvm/Support/ManagedStatic.h b/include/llvm/Support/ManagedStatic.h
index e6384c72135..c1ff0fef935 100644
--- a/include/llvm/Support/ManagedStatic.h
+++ b/include/llvm/Support/ManagedStatic.h
@@ -83,7 +83,7 @@ public:
       sys::MemoryFence();
       InitFlag = 2;
     } else if (OldFlag == 1)
-      while (OldFlag == 1) ;
+      while (InitFlag == 1) ;
     
     return *static_cast<C*>(Ptr);
   }