From 85f16f946218b172ff96dec4a89778ccacc4e4c1 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Tue, 29 Jan 2013 15:15:59 +0000 Subject: [PATCH] Fix uninitialized error caused by r173801. llvm-svn: 173803 --- clang/lib/Format/Format.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp index f6d7ec4..a8599df 100644 --- 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]); } -- 2.7.4