<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Jan 19, 2017 at 1:27 PM, Richard Smith <span dir="ltr"><<a href="mailto:richard@metafoo.co.uk" target="_blank">richard@metafoo.co.uk</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="auto"><div><div class="h5"><div><div class="gmail_extra"><div class="gmail_quote">On 19 Jan 2017 11:16 am, "Manman Ren via cfe-commits" <<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>> wrote:<br type="attribution"><blockquote class="m_4659765051604310924quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: mren<br>
Date: Thu Jan 19 13:05:55 2017<br>
New Revision: 292508<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=292508&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject?rev=292508&view=rev</a><br>
Log:<br>
Module: Improve diagnostic message when cxx modules are disabled and @import is used in Objective CXX.<br>
<br>
rdar://problem/19399671<br>
<br>
Added:<br>
cfe/trunk/test/Modules/<a href="http://check-syntax.mm" rel="noreferrer" target="_blank">check-s<wbr>yntax.mm</a><br>
Modified:<br>
cfe/trunk/include/clang/Basic/<wbr>DiagnosticParseKinds.td<br>
cfe/trunk/lib/Parse/ParseObjc.<wbr>cpp<br>
<br>
Modified: cfe/trunk/include/clang/Basic/<wbr>DiagnosticParseKinds.td<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td?rev=292508&r1=292507&r2=292508&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/cfe/trunk/include/clang/<wbr>Basic/DiagnosticParseKinds.td?<wbr>rev=292508&r1=292507&r2=<wbr>292508&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/include/clang/Basic/<wbr>DiagnosticParseKinds.td (original)<br>
+++ cfe/trunk/include/clang/Basic/<wbr>DiagnosticParseKinds.td Thu Jan 19 13:05:55 2017<br>
@@ -243,7 +243,10 @@ def err_expected_property_name : Error<"<br>
<br>
def err_unexpected_at : Error<"unexpected '@' in program">;<br>
def err_atimport : Error<<br>
-"use of '@import' when modules are disabled">;<br>
+ "use of '@import' when modules are disabled">;<br>
+def err_atimport_cxx : Error<<br>
+ "use of '@import' when C++ modules are disabled, consider using fmodules "<br>
+ "and fcxx-modules">;<br></blockquote></div></div></div><div dir="auto"><br></div></div></div><div dir="auto">Please add a hyphen before fmodules. There's also no reason to suggest -fcxx-modules; modules support for C++ is controlled by -fmodules nowadays.</div><div dir="auto"><br></div><div dir="auto">I also don't think it makes sense to have different diagnostics for C and C++ mode; we should suggest the -fmodules flag in either case.</div></div></blockquote><div><br></div><div>Hi Richard,</div><div><br></div><div>This is an internal patch that I am upstreaming to open source. Internally at Apple, modules support for C++ is off by default, users need to use -fcxx-modules to turn it on. So when they use -fmodules without -fcxx-modules, they will get a confusing error saying modules are disabled.</div><div><br></div><div>Open source, the testing case in this commit uses driver option -fno-cxx-modules, in this case, it makes sense to call out c++ modules so users know to remove -fno-cxx-modules.</div><div><br></div><div>Let me know your thoughts,</div><div>Manman</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="auto"><div><div class="h5"><div dir="auto"><br></div><div dir="auto"><div class="gmail_extra"><div class="gmail_quote"><blockquote class="m_4659765051604310924quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
def err_invalid_reference_qualifie<wbr>r_application : Error<<br>
"'%0' qualifier may not be applied to a reference">;<br>
<br>
Modified: cfe/trunk/lib/Parse/ParseObjc.<wbr>cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseObjc.cpp?rev=292508&r1=292507&r2=292508&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/cfe/trunk/lib/Parse/Pars<wbr>eObjc.cpp?rev=292508&r1=292507<wbr>&r2=292508&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/Parse/ParseObjc.<wbr>cpp (original)<br>
+++ cfe/trunk/lib/Parse/ParseObjc.<wbr>cpp Thu Jan 19 13:05:55 2017<br>
@@ -83,7 +83,10 @@ Parser::DeclGroupPtrTy Parser::ParseObjC<br>
case tok::objc_import:<br>
if (getLangOpts().Modules || getLangOpts().DebuggerSupport)<br>
return ParseModuleImport(AtLoc);<br>
- Diag(AtLoc, diag::err_atimport);<br>
+ if (getLangOpts().CPlusPlus)<br>
+ Diag(AtLoc, diag::err_atimport_cxx);<br>
+ else<br>
+ Diag(AtLoc, diag::err_atimport);<br>
SkipUntil(tok::semi);<br>
return Actions.ConvertDeclToDeclGroup<wbr>(nullptr);<br>
default:<br>
<br>
Added: cfe/trunk/test/Modules/<a href="http://check-syntax.mm" rel="noreferrer" target="_blank">check-s<wbr>yntax.mm</a><br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/check-syntax.mm?rev=292508&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/cfe/trunk/test/Modules/<wbr>check-syntax.mm?rev=292508&<wbr>view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Modules/<a href="http://check-syntax.mm" rel="noreferrer" target="_blank">check-s<wbr>yntax.mm</a> (added)<br>
+++ cfe/trunk/test/Modules/<a href="http://check-syntax.mm" rel="noreferrer" target="_blank">check-s<wbr>yntax.mm</a> Thu Jan 19 13:05:55 2017<br>
@@ -0,0 +1,5 @@<br>
+// RUN: not %clang -fmodules -fno-cxx-modules -fsyntax-only %s 2>&1 | FileCheck %s<br>
+// rdar://19399671<br>
+<br>
+// CHECK: use of '@import' when C++ modules are disabled<br>
+@import Foundation;<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></div></div>
</blockquote></div><br></div></div>