maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix the regression caused by r196378 

llvm-svn: 196380
This commit is contained in:
Alexander Kornienko 2013-12-04 13:25:26 +00:00
parent b8c367b49d
commit ecc232d521
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/lib/Format/Format.cpp
View File

@ -469,6 +469,9 @@ public:
if (TheLine->Last->Type == TT_LineComment) if (TheLine->Last->Type == TT_LineComment)
return 0; return 0;
if (Style.ColumnLimit > 0 && Indent > Style.ColumnLimit)
return 0;
unsigned Limit = unsigned Limit =
Style.ColumnLimit == 0 ? UINT_MAX : Style.ColumnLimit - Indent; Style.ColumnLimit == 0 ? UINT_MAX : Style.ColumnLimit - Indent;
// If we already exceed the column limit, we set 'Limit' to 0. The different // If we already exceed the column limit, we set 'Limit' to 0. The different
@ -477,9 +480,6 @@ public:
? 0 ? 0
: Limit - TheLine->Last->TotalLength; : Limit - TheLine->Last->TotalLength;
if (Indent > Limit)
return 0;
if (I + 1 == E || I[1]->Type == LT_Invalid) if (I + 1 == E || I[1]->Type == LT_Invalid)
return 0; return 0;