<div dir="auto"><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">cfe-commits@lists.llvm.org</a>> wrote:<br type="attribution"><blockquote class="quote" 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-<wbr>project?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-<wbr>syntax.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-<wbr>project/cfe/trunk/include/<wbr>clang/Basic/<wbr>DiagnosticParseKinds.td?rev=<wbr>292508&r1=292507&r2=292508&<wbr>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>
<br>
 def err_invalid_reference_<wbr>qualifier_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-<wbr>project/cfe/trunk/lib/Parse/<wbr>ParseObjc.cpp?rev=292508&r1=<wbr>292507&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.<wbr>ConvertDeclToDeclGroup(<wbr>nullptr);<br>
   default:<br>
<br>
Added: cfe/trunk/test/Modules/<a href="http://check-syntax.mm" rel="noreferrer" target="_blank">check-<wbr>syntax.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-<wbr>project/cfe/trunk/test/<wbr>Modules/check-syntax.mm?rev=<wbr>292508&view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Modules/<a href="http://check-syntax.mm" rel="noreferrer" target="_blank">check-<wbr>syntax.mm</a> (added)<br>
+++ cfe/trunk/test/Modules/<a href="http://check-syntax.mm" rel="noreferrer" target="_blank">check-<wbr>syntax.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></blockquote></div></div></div><div dir="auto"><br></div><div dir="auto">Please test for diagnostics with -verify rather than FileCheck when possible.</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">
+@import Foundation;<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></div></div>