commit 244920fbf25a294c941ccc476dd9ed9b46fe43dd
author Kadir Cetinkaya <kadircet@google.com> Thu Nov 25 20:11:46 2021 +0100
committer Copybara-Service <copybara-worker@google.com> Fri Nov 26 02:07:05 2021 -0800
tree cd3357ece5a2dac6badb4d657a3fc792a01fe5e9
parent 9d53de55df8e2f3201aab04e8f0410d5c2827182

[clang] Fix crash on broken parameter declarators

Differential Revision: https://reviews.llvm.org/D114609

GitOrigin-RevId: d026f2f7c688b326eae429286a06bf4080c8b527

lib/Parse/ParseDecl.cpp

diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
index a087106..1bdeccc 100644
--- a/lib/Parse/ParseDecl.cpp
+++ b/lib/Parse/ParseDecl.cpp
@@ -6978,13 +6978,13 @@
       //
       // We care about case 1) where the declarator type should be known, and
       // the identifier should be null.
-      if (!ParmDeclarator.isInvalidType() && !ParmDeclarator.hasName()) {
-        if (Tok.getIdentifierInfo() &&
-            Tok.getIdentifierInfo()->isKeyword(getLangOpts())) {
-          Diag(Tok, diag::err_keyword_as_parameter) << PP.getSpelling(Tok);
-          // Consume the keyword.
-          ConsumeToken();
-        }
+      if (!ParmDeclarator.isInvalidType() && !ParmDeclarator.hasName() &&
+          Tok.isNot(tok::raw_identifier) && !Tok.isAnnotation() &&
+          Tok.getIdentifierInfo() &&
+          Tok.getIdentifierInfo()->isKeyword(getLangOpts())) {
+        Diag(Tok, diag::err_keyword_as_parameter) << PP.getSpelling(Tok);
+        // Consume the keyword.
+        ConsumeToken();
       }
       // Inform the actions module about the parameter declarator, so it gets
       // added to the current scope.

test/Parser/cxx-keyword-identifiers.cpp

diff --git a/test/Parser/cxx-keyword-identifiers.cpp b/test/Parser/cxx-keyword-identifiers.cpp
index 4a60ce9..2c6f18e 100644
--- a/test/Parser/cxx-keyword-identifiers.cpp
+++ b/test/Parser/cxx-keyword-identifiers.cpp
@@ -25,3 +25,7 @@
     int case; // expected-error {{expected member name or ';'}}
   };
 }
+struct Foo {
+  void bar(*decltype(1) aux); // expected-error {{C++ requires a type specifier for all declarations}}. \
+                                 // expected-error {{expected ')'}} expected-note {{to match this '('}}
+};