diff options
| -rw-r--r-- | lib/Parse/ParseDecl.cpp | 6 | ||||
| -rw-r--r-- | test/Parser/cxx0x-decl.cpp | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp index fe92050694..86fc2d3a86 100644 --- a/lib/Parse/ParseDecl.cpp +++ b/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; diff --git a/test/Parser/cxx0x-decl.cpp b/test/Parser/cxx0x-decl.cpp index 3b883dc76c..d74b337b31 100644 --- a/test/Parser/cxx0x-decl.cpp +++ b/test/Parser/cxx0x-decl.cpp @@ -39,3 +39,5 @@ static_assert(something, ""); // expected-error {{undeclared identifier}} struct SS { typedef void d() = default; // expected-error {{function definition declared 'typedef'}} expected-error {{only special member functions may be defaulted}} }; + +using PR14855 = int S::; // expected-error {{expected ';' after alias declaration}} |