summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2013-02-23 08:07:18 +0000
committerDaniel Jasper <djasper@google.com>2013-02-23 08:07:18 +0000
commitba0bda9739214627e5d927fd0a16a072f7dcd56c (patch)
treea1a222985029c83a870bd976688911f436d92fda /clang/lib
parentaf5ba0ed8cb742475d8de6c6f4e5718b8ebbf34c (diff)
downloadbcm5719-llvm-ba0bda9739214627e5d927fd0a16a072f7dcd56c.tar.gz
bcm5719-llvm-ba0bda9739214627e5d927fd0a16a072f7dcd56c.zip
Don't recognize unnamed pointer parameters as casts.
This fixes llvm.org/PR15061. Before: virtual void f(int *)const; After: virtual void f(int *) const; llvm-svn: 175960
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Format/TokenAnnotator.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
index 359923f02f8..80780185c0e 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -602,7 +602,8 @@ private:
!Current.Children.empty() && (Current.Children[0].is(tok::equal) ||
Current.Children[0].is(tok::semi) ||
Current.Children[0].is(tok::l_brace));
- if (ParensNotExpr && !ParensCouldEndDecl)
+ if (ParensNotExpr && !ParensCouldEndDecl &&
+ Contexts.back().IsExpression)
// FIXME: We need to get smarter and understand more cases of casts.
Current.Type = TT_CastRParen;
} else if (Current.is(tok::at) && Current.Children.size()) {
OpenPOWER on IntegriCloud