<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On 7 June 2017 at 17:56, Richard Trieu 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: rtrieu<br>
Date: Wed Jun  7 19:56:21 2017<br>
New Revision: 304956<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=304956&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=304956&view=rev</a><br>
Log:<br>
[ODRHash] Change the fall-back diagnostic error.<br>
<br>
Provide a little more information when a ODR violation is detected, but the<br>
specific error could not be diagnosed.<br>
<br>
Modified:<br>
    cfe/trunk/include/clang/Basic/<wbr>DiagnosticSerializationKinds.<wbr>td<br>
    cfe/trunk/lib/Serialization/<wbr>ASTReader.cpp<br>
<br>
Modified: cfe/trunk/include/clang/Basic/<wbr>DiagnosticSerializationKinds.<wbr>td<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSerializationKinds.td?rev=304956&r1=304955&r2=304956&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/include/<wbr>clang/Basic/<wbr>DiagnosticSerializationKinds.<wbr>td?rev=304956&r1=304955&r2=<wbr>304956&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/include/clang/Basic/<wbr>DiagnosticSerializationKinds.<wbr>td (original)<br>
+++ cfe/trunk/include/clang/Basic/<wbr>DiagnosticSerializationKinds.<wbr>td Wed Jun  7 19:56:21 2017<br>
@@ -174,6 +174,13 @@ def note_module_odr_violation_<wbr>mismatch_d<br>
   "method %2 with %ordinal3 parameter of type %4%select{| decayed from %6}5|"<br>
   "method %2 with %ordinal3 parameter named %4}1">;<br>
<br>
+def err_module_odr_violation_<wbr>mismatch_decl_unknown : Error<<br>
+  "%q0 has different definitions in different modules; first difference is "<br>
+  "%select{definition in module '%2'|defined here}1 found different "<br>
+  "%select{||||static assert|field|method|other}3">;<br>
+def note_module_odr_violation_<wbr>mismatch_decl_unknown : Note<<br>
+  "but in '%0' found different %select{||||static assert|field|method|other}1">;<br></blockquote><div><br></div><div>This will produce messages like</div><div><br></div><div>"first difference is defined here found different static assert"</div><div>"first difference is definition in module 'X' found different other"</div><div><br></div><div>... which seem pretty confusing. Can this be rephrased so that it forms easier-to-read sentences? (Also, can we get some test coverage for this diagnostic?)</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+<br>
 def warn_duplicate_module_file_<wbr>extension : Warning<<br>
   "duplicate module file extension block name '%0'">,<br>
   InGroup<ModuleFileExtension>;<br>
<br>
Modified: cfe/trunk/lib/Serialization/<wbr>ASTReader.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReader.cpp?rev=304956&r1=304955&r2=304956&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/<wbr>Serialization/ASTReader.cpp?<wbr>rev=304956&r1=304955&r2=<wbr>304956&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/Serialization/<wbr>ASTReader.cpp (original)<br>
+++ cfe/trunk/lib/Serialization/<wbr>ASTReader.cpp Wed Jun  7 19:56:21 2017<br>
@@ -9753,13 +9753,13 @@ void ASTReader::<wbr>diagnoseOdrViolations()<br>
       if (Diagnosed == true)<br>
         continue;<br>
<br>
-      Diag(FirstRecord->getLocation(<wbr>),<br>
-           diag::err_module_odr_<wbr>violation_different_<wbr>definitions)<br>
-          << FirstRecord << FirstModule.empty() << FirstModule;<br>
-<br>
-      Diag(SecondRecord-><wbr>getLocation(),<br>
-           diag::note_module_odr_<wbr>violation_different_<wbr>definitions)<br>
-          << SecondModule;<br>
+      Diag(FirstDecl->getLocation(),<br>
+           diag::err_module_odr_<wbr>violation_mismatch_decl_<wbr>unknown)<br>
+          << FirstRecord << FirstModule.empty() << FirstModule << FirstDiffType<br>
+          << FirstDecl->getSourceRange();<br>
+      Diag(SecondDecl->getLocation()<wbr>,<br>
+           diag::note_module_odr_<wbr>violation_mismatch_decl_<wbr>unknown)<br>
+          << SecondModule << FirstDiffType << SecondDecl->getSourceRange();<br>
       Diagnosed = true;<br>
     }<br>
<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>