diff options
| author | Manuel Klimek <klimek@google.com> | 2013-01-23 14:08:21 +0000 |
|---|---|---|
| committer | Manuel Klimek <klimek@google.com> | 2013-01-23 14:08:21 +0000 |
| commit | a32a7fda316289dca6aac1352fde3caf14a1cb2f (patch) | |
| tree | dab48dbe824f0b6323ec80ef704572cf0c324a36 /lib/Format/Format.cpp | |
| parent | 20d3583857c2cc99dcc9c27ff5f23916df9c0812 (diff) | |
Fixes layouting regression and invalid-read.
Layouting would prevent breaking before + in
a[b + c] = d;
Regression detected by code review.
Also fixes an invalid-read found by the valgrind bot.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@173262 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Format/Format.cpp')
| -rw-r--r-- | lib/Format/Format.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp index d95deb5704..2952067c39 100644 --- a/lib/Format/Format.cpp +++ b/lib/Format/Format.cpp @@ -1256,8 +1256,10 @@ private: IsExpression = true; AnnotatedToken *Previous = Current.Parent; while (Previous != NULL) { - if (Previous->Type == TT_BinaryOperator) + if (Previous->Type == TT_BinaryOperator && + (Previous->is(tok::star) || Previous->is(tok::amp))) { Previous->Type = TT_PointerOrReference; + } Previous = Previous->Parent; } } |