<div dir="auto"><div><br><div class="gmail_extra"><br><div class="gmail_quote">On May 4, 2017 4:55 PM, "Nico Weber via Phabricator" <<a href="mailto:reviews@reviews.llvm.org">reviews@reviews.llvm.org</a>> wrote:<br type="attribution"><blockquote class="quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">thakis created this revision.<br>
Herald added a subscriber: javed.absar.<br>
<br>
<a href="https://reviews.llvm.org/D32879" rel="noreferrer" target="_blank">https://reviews.llvm.org/<wbr>D32879</a><br>
<br>
Files:<br>
include/clang/Basic/<wbr>DiagnosticSemaKinds.td<br>
lib/Parse/ParseDeclCXX.cpp<br>
lib/Sema/SemaDeclAttr.cpp<br>
test/Parser/<wbr>MicrosoftExtensions.cpp<br>
test/Parser/<a href="http://ms-square-bracket-attributes.mm" rel="noreferrer" target="_blank">ms-square-bracket-<wbr>attributes.mm</a><br>
test/SemaCXX/ms-uuid.cpp<br>
<br>
<br>
Index: test/SemaCXX/ms-uuid.cpp<br>
==============================<wbr>==============================<wbr>=======<br>
--- test/SemaCXX/ms-uuid.cpp<br>
+++ test/SemaCXX/ms-uuid.cpp<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>
Index: test/Parser/<a href="http://ms-square-bracket-attributes.mm" rel="noreferrer" target="_blank">ms-square-bracket-<wbr>attributes.mm</a><br>
==============================<wbr>==============================<wbr>=======<br>
--- test/Parser/<a href="http://ms-square-bracket-attributes.mm" rel="noreferrer" target="_blank">ms-square-bracket-<wbr>attributes.mm</a><br>
+++ test/Parser/<a href="http://ms-square-bracket-attributes.mm" rel="noreferrer" target="_blank">ms-square-bracket-<wbr>attributes.mm</a><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>
Index: test/Parser/<wbr>MicrosoftExtensions.cpp<br>
==============================<wbr>==============================<wbr>=======<br>
--- test/Parser/<wbr>MicrosoftExtensions.cpp<br>
+++ test/Parser/<wbr>MicrosoftExtensions.cpp<br>
@@ -60,7 +60,7 @@<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 ATL attribute is deprecated, use __declspec instead}}<br>
<br>
struct<br>
struct_with_uuid2 {} ;<br>
Index: lib/Sema/SemaDeclAttr.cpp<br>
==============================<wbr>==============================<wbr>=======<br>
--- lib/Sema/SemaDeclAttr.cpp<br>
+++ lib/Sema/SemaDeclAttr.cpp<br>
@@ -5079,6 +5079,15 @@<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>
Index: lib/Parse/ParseDeclCXX.cpp<br>
==============================<wbr>==============================<wbr>=======<br>
--- lib/Parse/ParseDeclCXX.cpp<br>
+++ lib/Parse/ParseDeclCXX.cpp<br>
@@ -4151,8 +4151,6 @@<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>
Index: include/clang/Basic/<wbr>DiagnosticSemaKinds.td<br>
==============================<wbr>==============================<wbr>=======<br>
--- include/clang/Basic/<wbr>DiagnosticSemaKinds.td<br>
+++ include/clang/Basic/<wbr>DiagnosticSemaKinds.td<br>
@@ -730,6 +730,9 @@<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 ATL attribute is deprecated, use __declspec instead">,<br></blockquote></div></div></div><div dir="auto"><br></div><div dir="auto">as an ATL attribute</div><div dir="auto"><br></div><div dir="auto">Please quoute uuid.</div><div dir="auto"><br></div><div dir="auto">Replace the comma with a semicolon.</div><div dir="auto"><br></div><div dir="auto"><div class="gmail_extra"><div class="gmail_quote"><blockquote class="quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ 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>
<br>
</blockquote></div><br></div></div></div>