[Clang] disallow # operators in attribute argument lists

clang/docs/ReleaseNotes.rst

@@ -678,6 +678,8 @@ Improvements to Clang's diagnostics
 - Clang now accepts ``@tparam`` comments on variable template partial
   specializations. (#GH144775)
 
+- Clang now rejects ``#`` operators in attribute argument lists. (#GH147217)
+
 Improvements to Clang's time-trace
 ----------------------------------
 

clang/include/clang/Basic/DiagnosticParseKinds.td

@@ -827,6 +827,8 @@ def err_ms_property_expected_comma_or_rparen : Error<
   "expected ',' or ')' at end of property accessor list">;
 def err_ms_property_initializer : Error<
   "property declaration cannot have a default member initializer">;
+def err_invalid_attribute_argument
+    : Error<"'%0' is not allowed in an attribute argument list">;
 
 def err_assume_attr_expects_cond_expr : Error<
   "use of this expression in an %0 attribute requires parentheses">;

clang/lib/Parse/ParseDecl.cpp

@@ -488,6 +488,13 @@ unsigned Parser::ParseAttributeArgsCommon(
   bool AttributeHasVariadicIdentifierArg =
       attributeHasVariadicIdentifierArg(*AttrName, Form.getSyntax(), ScopeName);
 
+  if (getLangOpts().CPlusPlus && Tok.isOneOf(tok::hash, tok::hashhash)) {
+    Diag(Tok.getLocation(), diag::err_invalid_attribute_argument)
+        << PP.getSpelling(Tok);
+    SkipUntil(tok::r_paren, StopAtSemi);
+    return 0;
+  }
+
   // Interpret "kw_this" as an identifier if the attributed requests it.
   if (ChangeKWThisToIdent && Tok.is(tok::kw_this))
     Tok.setKind(tok::identifier);

clang/test/Parser/cxx0x-attributes.cpp

@@ -477,3 +477,10 @@ namespace P2361 {
 }
 
 alignas(int) struct AlignAsAttribute {}; // expected-error {{misplaced attributes; expected attributes here}}
+
+namespace GH147217 {
+  [[clang::annotate(#)]] void a();    // expected-error {{'#' is not allowed in an attribute argument list}}
+  [[clang::annotate(##)]] void b();   // expected-error {{'##' is not allowed in an attribute argument list}}
+  [[clang::annotate(%:)]] void c();   // expected-error {{'%:' is not allowed in an attribute argument list}}
+  [[clang::annotate(%:%:)]] void d(); // expected-error {{'%:%:' is not allowed in an attribute argument list}}
+}