<div dir="ltr">Timestamps on cfe-commits are a bit messed up. I landed that just now, but the timestamp is from 13 minutes in the past. Maybe the clock on the mail server is off by 13 min?</div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, May 5, 2017 at 1:05 PM, Nico Weber via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: nico<br>
Date: Fri May  5 12:05:56 2017<br>
New Revision: 302255<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=302255&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=302255&view=rev</a><br>
Log:<br>
Warn that the [] spelling of uuid(...) is deprecated.<br>
<br>
<a href="https://reviews.llvm.org/D32879" rel="noreferrer" target="_blank">https://reviews.llvm.org/<wbr>D32879</a><br>
<br>
Modified:<br>
    cfe/trunk/include/clang/Basic/<wbr>DiagnosticSemaKinds.td<br>
    cfe/trunk/lib/Parse/<wbr>ParseDeclCXX.cpp<br>
    cfe/trunk/lib/Sema/<wbr>SemaDeclAttr.cpp<br>
    cfe/trunk/test/Parser/<wbr>MicrosoftExtensions.cpp<br>
    cfe/trunk/test/Parser/<a href="http://ms-square-bracket-attributes.mm" rel="noreferrer" target="_blank">ms-<wbr>square-bracket-attributes.mm</a><br>
    cfe/trunk/test/SemaCXX/ms-<wbr>uuid.cpp<br>
<br>
Modified: cfe/trunk/include/clang/Basic/<wbr>DiagnosticSemaKinds.td<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=302255&r1=302254&r2=302255&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/include/<wbr>clang/Basic/<wbr>DiagnosticSemaKinds.td?rev=<wbr>302255&r1=302254&r2=302255&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/include/clang/Basic/<wbr>DiagnosticSemaKinds.td (original)<br>
+++ cfe/trunk/include/clang/Basic/<wbr>DiagnosticSemaKinds.td Fri May  5 12:05:56 2017<br>
@@ -730,6 +730,9 @@ def err_super_in_lambda_<wbr>unsupported : Er<br>
 def warn_pragma_unused_undeclared_<wbr>var : Warning<<br>
   "undeclared variable %0 used as an argument for '#pragma unused'">,<br>
   InGroup<IgnoredPragmas>;<br>
+def warn_atl_uuid_deprecated : Warning<<br>
+  "specifying 'uuid' as an ATL attribute is deprecated; use __declspec instead">,<br>
+  InGroup<<wbr>DeprecatedDeclarations>;<br>
 def warn_pragma_unused_expected_<wbr>var_arg : Warning<<br>
   "only variables can be arguments to '#pragma unused'">,<br>
   InGroup<IgnoredPragmas>;<br>
<br>
Modified: cfe/trunk/lib/Parse/<wbr>ParseDeclCXX.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseDeclCXX.cpp?rev=302255&r1=302254&r2=302255&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/Parse/<wbr>ParseDeclCXX.cpp?rev=302255&<wbr>r1=302254&r2=302255&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/Parse/<wbr>ParseDeclCXX.cpp (original)<br>
+++ cfe/trunk/lib/Parse/<wbr>ParseDeclCXX.cpp Fri May  5 12:05:56 2017<br>
@@ -4151,8 +4151,6 @@ void Parser::<wbr>ParseMicrosoftUuidAttribute<br>
   }<br>
<br>
   if (!T.consumeClose()) {<br>
-    // FIXME: Warn that this syntax is deprecated, with a Fix-It suggesting<br>
-    // using __declspec(uuid()) instead.<br>
     Attrs.addNew(UuidIdent, SourceRange(UuidLoc, T.getCloseLocation()), nullptr,<br>
                  SourceLocation(), ArgExprs.data(), ArgExprs.size(),<br>
                  AttributeList::AS_Microsoft);<br>
<br>
Modified: cfe/trunk/lib/Sema/<wbr>SemaDeclAttr.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclAttr.cpp?rev=302255&r1=302254&r2=302255&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/Sema/<wbr>SemaDeclAttr.cpp?rev=302255&<wbr>r1=302254&r2=302255&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/Sema/<wbr>SemaDeclAttr.cpp (original)<br>
+++ cfe/trunk/lib/Sema/<wbr>SemaDeclAttr.cpp Fri May  5 12:05:56 2017<br>
@@ -5079,6 +5079,15 @@ static void handleUuidAttr(Sema &S, Decl<br>
     }<br>
   }<br>
<br>
+  // FIXME: It'd be nice to also emit a fixit removing uuid(...) (and, if it's<br>
+  // the only thing in the [] list, the [] too), and add an insertion of<br>
+  // __declspec(uuid(...)).  But sadly, neither the SourceLocs of the commas<br>
+  // separating attributes nor of the [ and the ] are in the AST.<br>
+  // Cf "SourceLocations of attribute list delimiters â€“ [[ ... , ... ]] etc"<br>
+  // on cfe-dev.<br>
+  if (Attr.isMicrosoftAttribute()) // Check for [uuid(...)] spelling.<br>
+    S.Diag(Attr.getLoc(), diag::warn_atl_uuid_<wbr>deprecated);<br>
+<br>
   UuidAttr *UA = S.mergeUuidAttr(D, Attr.getRange(),<br>
                                  Attr.<wbr>getAttributeSpellingListIndex(<wbr>), StrRef);<br>
   if (UA)<br>
<br>
Modified: cfe/trunk/test/Parser/<wbr>MicrosoftExtensions.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/MicrosoftExtensions.cpp?rev=302255&r1=302254&r2=302255&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Parser/<wbr>MicrosoftExtensions.cpp?rev=<wbr>302255&r1=302254&r2=302255&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Parser/<wbr>MicrosoftExtensions.cpp (original)<br>
+++ cfe/trunk/test/Parser/<wbr>MicrosoftExtensions.cpp Fri May  5 12:05:56 2017<br>
@@ -60,7 +60,7 @@ struct struct_without_uuid { };<br>
 struct __declspec(uuid("000000A0-<wbr>0000-0000-C000-000000000049"))<br>
 struct_with_uuid2;<br>
<br>
-[uuid("000000A0-0000-0000-<wbr>C000-000000000049")] struct struct_with_uuid3;<br>
+[uuid("000000A0-0000-0000-<wbr>C000-000000000049")] struct struct_with_uuid3; // expected-warning{{specifying 'uuid' as an ATL attribute is deprecated; use __declspec instead}}<br>
<br>
 struct<br>
 struct_with_uuid2 {} ;<br>
<br>
Modified: cfe/trunk/test/Parser/<a href="http://ms-square-bracket-attributes.mm" rel="noreferrer" target="_blank">ms-<wbr>square-bracket-attributes.mm</a><br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/ms-square-bracket-attributes.mm?rev=302255&r1=302254&r2=302255&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Parser/<wbr>ms-square-bracket-attributes.<wbr>mm?rev=302255&r1=302254&r2=<wbr>302255&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Parser/<a href="http://ms-square-bracket-attributes.mm" rel="noreferrer" target="_blank">ms-<wbr>square-bracket-attributes.mm</a> (original)<br>
+++ cfe/trunk/test/Parser/<a href="http://ms-square-bracket-attributes.mm" rel="noreferrer" target="_blank">ms-<wbr>square-bracket-attributes.mm</a> Fri May  5 12:05:56 2017<br>
@@ -1,4 +1,4 @@<br>
-// RUN: %clang_cc1 -fsyntax-only -std=c++14 -verify -fms-extensions %s<br>
+// RUN: %clang_cc1 -fsyntax-only -std=c++14 -verify -fms-extensions %s -Wno-deprecated-declarations<br>
<br>
 typedef struct _GUID {<br>
   unsigned long Data1;<br>
<br>
Modified: cfe/trunk/test/SemaCXX/ms-<wbr>uuid.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/ms-uuid.cpp?rev=302255&r1=302254&r2=302255&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/<wbr>SemaCXX/ms-uuid.cpp?rev=<wbr>302255&r1=302254&r2=302255&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/SemaCXX/ms-<wbr>uuid.cpp (original)<br>
+++ cfe/trunk/test/SemaCXX/ms-<wbr>uuid.cpp Fri May  5 12:05:56 2017<br>
@@ -1,4 +1,4 @@<br>
-// RUN: %clang_cc1 -fsyntax-only -verify -fms-extensions %s<br>
+// RUN: %clang_cc1 -fsyntax-only -verify -fms-extensions %s -Wno-deprecated-declarations<br>
<br>
 typedef struct _GUID {<br>
   unsigned long Data1;<br>
<br>
<br>
______________________________<wbr>_________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>