<div dir="ltr">Reviewed here: <a href="https://reviews.llvm.org/D33505">https://reviews.llvm.org/D33505</a><div><br>Still, please make this warn.</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, May 24, 2017 at 3:42 PM, Nico Weber <span dir="ltr"><<a href="mailto:thakis@google.com" target="_blank">thakis@google.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Was this reviewed somewhere?<div><br></div><div>Please make it so that this emits a warning. We want clang-cl to warn on invalid code (and in system headers warnings are suppressed).</div></div><div class="HOEnZb"><div class="h5"><div class="gmail_extra"><br><div class="gmail_quote">On Wed, May 24, 2017 at 3:31 PM, Erich Keane 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: erichkeane<br>
Date: Wed May 24 14:31:19 2017<br>
New Revision: 303798<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=303798&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject?rev=303798&view=rev</a><br>
Log:<br>
For Microsoft compatibility, set fno_operator_names<br>
<br>
There's a Microsoft header in the Windows SDK which won't<br>
compile with clang because it uses an operator name (and)<br>
as a field name. This patch allows that file to compile by<br>
setting the option which disables operator names.<br>
The header which doesn't compile <Query.h> C:/Program Files (x86)/<br>
Windows Kits/10/include/10.0.14393.0/u<wbr>m\Query.h:259:40:<br>
error: expected member name or ';' after declaration specifiers<br>
<br>
/* [case()] */ NODERESTRICTION or;<br>
~~~~~~~~~~~~~~~ ^<br>
<br>
1 error generated.<br>
<br>
Contributed for Melanie Blower<br>
<br>
Differential Revision:<a href="https://reviews.llvm.org/D33505" rel="noreferrer" target="_blank">https://reviews.llvm.<wbr>org/D33505</a><br>
<br>
Modified:<br>
cfe/trunk/lib/Frontend/Compile<wbr>rInvocation.cpp<br>
cfe/trunk/test/Parser/Microsof<wbr>tExtensions.cpp<br>
cfe/trunk/test/Preprocessor/cx<wbr>x_oper_keyword.cpp<br>
<br>
Modified: cfe/trunk/lib/Frontend/Compile<wbr>rInvocation.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/CompilerInvocation.cpp?rev=303798&r1=303797&r2=303798&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/cfe/trunk/lib/Frontend/<wbr>CompilerInvocation.cpp?rev=<wbr>303798&r1=303797&r2=303798&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/Frontend/Compile<wbr>rInvocation.cpp (original)<br>
+++ cfe/trunk/lib/Frontend/Compile<wbr>rInvocation.cpp Wed May 24 14:31:19 2017<br>
@@ -1882,7 +1882,7 @@ static void ParseLangArgs(LangOptions &O<br>
Opts.GNUKeywords = Args.hasFlag(OPT_fgnu_keywords<wbr>, OPT_fno_gnu_keywords,<br>
Opts.GNUKeywords);<br>
<br>
- if (Args.hasArg(OPT_fno_operator_<wbr>names))<br>
+ if (Args.hasArg(OPT_fno_operator_<wbr>names) || Args.hasArg(OPT_fms_compatibil<wbr>ity))<br>
Opts.CXXOperatorNames = 0;<br>
<br>
if (Args.hasArg(OPT_fcuda_is_devi<wbr>ce))<br>
<br>
Modified: cfe/trunk/test/Parser/Microsof<wbr>tExtensions.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/MicrosoftExtensions.cpp?rev=303798&r1=303797&r2=303798&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/cfe/trunk/test/Parser/Mi<wbr>crosoftExtensions.cpp?rev=3037<wbr>98&r1=303797&r2=303798&view=<wbr>diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Parser/Microsof<wbr>tExtensions.cpp (original)<br>
+++ cfe/trunk/test/Parser/Microsof<wbr>tExtensions.cpp Wed May 24 14:31:19 2017<br>
@@ -261,9 +261,8 @@ int __identifier(else} = __identifier(fo<br>
#define identifier_weird(x) __identifier(x<br>
int k = identifier_weird(if)); // expected-error {{use of undeclared identifier 'if'}}<br>
<br>
-// This is a bit weird, but the alternative tokens aren't keywords, and this<br>
-// behavior matches MSVC. FIXME: Consider supporting this anyway.<br>
-extern int __identifier(and) r; // expected-error {{cannot convert '&&' token to an identifier}}<br>
+// 'and' is not an operator name with Microsoft compatibility.<br>
+extern int __identifier(and) r; // expected-error {{expected ';' after top level declarator}}<br>
<br>
void f() {<br>
__identifier(() // expected-error {{cannot convert '(' token to an identifier}}<br>
@@ -355,7 +354,6 @@ void TestProperty() {<br>
++sp.V11;<br>
}<br>
<br>
-//expected-warning@+1 {{C++ operator 'and' (aka '&&') used as a macro name}}<br>
#define and foo<br>
<br>
struct __declspec(uuid("00000000-0000<wbr>-0000-C000-000000000046")) __declspec(novtable) IUnknown {};<br>
<br>
Modified: cfe/trunk/test/Preprocessor/cx<wbr>x_oper_keyword.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/cxx_oper_keyword.cpp?rev=303798&r1=303797&r2=303798&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/cfe/trunk/test/Preproces<wbr>sor/cxx_oper_keyword.cpp?rev=<wbr>303798&r1=303797&r2=303798&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Preprocessor/cx<wbr>x_oper_keyword.cpp (original)<br>
+++ cfe/trunk/test/Preprocessor/cx<wbr>x_oper_keyword.cpp Wed May 24 14:31:19 2017<br>
@@ -1,5 +1,6 @@<br>
// RUN: %clang_cc1 %s -E -verify -DOPERATOR_NAMES<br>
// RUN: %clang_cc1 %s -E -verify -fno-operator-names<br>
+// RUN: %clang_cc1 %s -verify -DTESTWIN -fms-compatibility<br>
<br>
#ifndef OPERATOR_NAMES<br>
//expected-error@+3 {{token is not a valid binary operator in a preprocessor subexpression}}<br>
@@ -29,3 +30,14 @@<br>
#ifdef and<br>
#warning and is defined<br>
#endif<br>
+<br>
+#ifdef TESTWIN<br>
+// For cl compatibility, fno-operator-names is enabled by default.<br>
+int and;<br>
+int bitand;<br>
+int bitor;<br>
+int compl;<br>
+int not;<br>
+int or;<br>
+int xor;<br>
+#endif<br>
<br>
<br>
______________________________<wbr>_________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">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>
</div></div></blockquote></div><br></div>