From ecc232d521ad8a433ca0422acae16af87136a169 Mon Sep 17 00:00:00 2001
From: Alexander Kornienko <alexfh@google.com>
Date: Wed, 4 Dec 2013 13:25:26 +0000
Subject: [PATCH] Fix the regression caused by r196378

llvm-svn: 196380
---
 clang/lib/Format/Format.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp
index 156ff6429c00..26a320b05a06 100644
--- a/clang/lib/Format/Format.cpp
+++ b/clang/lib/Format/Format.cpp
@@ -469,6 +469,9 @@ public:
     if (TheLine->Last->Type == TT_LineComment)
       return 0;
 
+    if (Style.ColumnLimit > 0 && Indent > Style.ColumnLimit)
+      return 0;
+
     unsigned Limit =
         Style.ColumnLimit == 0 ? UINT_MAX : Style.ColumnLimit - Indent;
     // If we already exceed the column limit, we set 'Limit' to 0. The different
@@ -477,9 +480,6 @@ public:
                 ? 0
                 : Limit - TheLine->Last->TotalLength;
 
-    if (Indent > Limit)
-      return 0;
-
     if (I + 1 == E || I[1]->Type == LT_Invalid)
       return 0;