projects
/
platform
/
upstream
/
llvm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0942e0b
)
Fix uninitialized error caused by r173801.
author
Daniel Jasper
<djasper@google.com>
Tue, 29 Jan 2013 15:15:59 +0000
(15:15 +0000)
committer
Daniel Jasper
<djasper@google.com>
Tue, 29 Jan 2013 15:15:59 +0000
(15:15 +0000)
llvm-svn: 173803
clang/lib/Format/Format.cpp
patch
|
blob
|
history
diff --git
a/clang/lib/Format/Format.cpp
b/clang/lib/Format/Format.cpp
index
f6d7ec4
..
a8599df
100644
(file)
--- a/
clang/lib/Format/Format.cpp
+++ b/
clang/lib/Format/Format.cpp
@@
-1234,8
+1234,9
@@
public:
Current.TotalLength =
Current.Parent->TotalLength + Current.FormatTok.TokenLength +
(Current.SpaceRequiredBefore ? 1 : 0);
- if (Current.CanBreakBefore)
- Current.SplitPenalty = splitPenalty(Current);
+ // FIXME: Only calculate this if CanBreakBefore is true once static
+ // initializers etc. are sorted out.
+ Current.SplitPenalty = splitPenalty(Current);
if (!Current.Children.empty())
calculateExtraInformation(Current.Children[0]);
}