diff options
| -rw-r--r-- | clang/lib/Parse/ParseDecl.cpp | 9 | ||||
| -rw-r--r-- | clang/test/Parser/colon-colon-parentheses.cpp | 10 |
2 files changed, 14 insertions, 5 deletions
diff --git a/clang/lib/Parse/ParseDecl.cpp b/clang/lib/Parse/ParseDecl.cpp index 4039f2ac2a3..c85ea4a11fe 100644 --- a/clang/lib/Parse/ParseDecl.cpp +++ b/clang/lib/Parse/ParseDecl.cpp @@ -5198,6 +5198,15 @@ void Parser::ParseDirectDeclarator(Declarator &D) { } goto PastIdentifier; } + + if (D.getCXXScopeSpec().isNotEmpty()) { + // We have a scope specifier but no following unqualified-id. + Diag(PP.getLocForEndOfToken(D.getCXXScopeSpec().getEndLoc()), + diag::err_expected_unqualified_id) + << /*C++*/1; + D.SetIdentifier(nullptr, Tok.getLocation()); + goto PastIdentifier; + } } else if (Tok.is(tok::identifier) && D.mayHaveIdentifier()) { assert(!getLangOpts().CPlusPlus && "There's a C++-specific check for tok::identifier above"); diff --git a/clang/test/Parser/colon-colon-parentheses.cpp b/clang/test/Parser/colon-colon-parentheses.cpp index e031ce2e904..b3db4fbed2f 100644 --- a/clang/test/Parser/colon-colon-parentheses.cpp +++ b/clang/test/Parser/colon-colon-parentheses.cpp @@ -22,9 +22,9 @@ void foo() { } #ifdef PR21815 -// expected-error@+4{{C++ requires a type specifier for all declarations}} -// expected-error@+3{{expected unqualified-id}} -// expected-error@+3{{expected expression}} -// expected-error@+1{{expected ';' after top level declarator}} -a (::( +// expected-error@+2{{C++ requires a type specifier for all declarations}} +// expected-error@+1{{expected unqualified-id}} +a (::( )); + +::((c )); // expected-error{{expected unqualified-id}} #endif |
