summaryrefslogtreecommitdiffstats
path: root/clang/lib/Parse/ParseDecl.cpp
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2013-01-08 22:43:49 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2013-01-08 22:43:49 +0000
commit5f044ad5f0832d3eede401a4ae34eb782584fa5f (patch)
treed62b151a7d8e3bffd2652a2311ebad10f404f2fb /clang/lib/Parse/ParseDecl.cpp
parentb68dd4717e1e47a67e42b6a0fbde0df545340a61 (diff)
downloadbcm5719-llvm-5f044ad5f0832d3eede401a4ae34eb782584fa5f.tar.gz
bcm5719-llvm-5f044ad5f0832d3eede401a4ae34eb782584fa5f.zip
PR14855: don't silently swallow a nested-name-specifier after a type name.
llvm-svn: 171908
Diffstat (limited to 'clang/lib/Parse/ParseDecl.cpp')
-rw-r--r--clang/lib/Parse/ParseDecl.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/clang/lib/Parse/ParseDecl.cpp b/clang/lib/Parse/ParseDecl.cpp
index fe920506949..86fc2d3a862 100644
--- a/clang/lib/Parse/ParseDecl.cpp
+++ b/clang/lib/Parse/ParseDecl.cpp
@@ -4189,7 +4189,11 @@ void Parser::ParseDeclaratorInternal(Declarator &D,
if (SS.isNotEmpty()) {
if (Tok.isNot(tok::star)) {
// The scope spec really belongs to the direct-declarator.
- D.getCXXScopeSpec() = SS;
+ if (D.mayHaveIdentifier())
+ D.getCXXScopeSpec() = SS;
+ else
+ AnnotateScopeToken(SS, true);
+
if (DirectDeclParser)
(this->*DirectDeclParser)(D);
return;
OpenPOWER on IntegriCloud