<div dir="ltr">Not worth/reasonable to have a test case?</div><br><div class="gmail_quote"><div dir="ltr">On Thu, Oct 13, 2016 at 7:44 PM Richard Smith via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rsmith<br class="gmail_msg">
Date: Thu Oct 13 21:35:11 2016<br class="gmail_msg">
New Revision: 284187<br class="gmail_msg">
<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=284187&view=rev" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project?rev=284187&view=rev</a><br class="gmail_msg">
Log:<br class="gmail_msg">
Fix bogus assert breaking modules self-host.<br class="gmail_msg">
<br class="gmail_msg">
Modified:<br class="gmail_msg">
    cfe/trunk/lib/AST/ASTContext.cpp<br class="gmail_msg">
<br class="gmail_msg">
Modified: cfe/trunk/lib/AST/ASTContext.cpp<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ASTContext.cpp?rev=284187&r1=284186&r2=284187&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ASTContext.cpp?rev=284187&r1=284186&r2=284187&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- cfe/trunk/lib/AST/ASTContext.cpp (original)<br class="gmail_msg">
+++ cfe/trunk/lib/AST/ASTContext.cpp Thu Oct 13 21:35:11 2016<br class="gmail_msg">
@@ -907,11 +907,13 @@ void ASTContext::mergeDefinitionIntoModu<br class="gmail_msg">
   assert(Other->isFromASTFile() && "merge of non-imported decl not supported");<br class="gmail_msg">
   assert(Def != Other && "merging definition into itself");<br class="gmail_msg">
<br class="gmail_msg">
-  if (!getLangOpts().ModulesLocalVisibility && !Other->isHidden())<br class="gmail_msg">
+  if (!Other->isHidden()) {<br class="gmail_msg">
     Def->setHidden(false);<br class="gmail_msg">
-  else<br class="gmail_msg">
-    assert(Other->getImportedOwningModule() &&<br class="gmail_msg">
-           "hidden, imported declaration has no owning module");<br class="gmail_msg">
+    return;<br class="gmail_msg">
+  }<br class="gmail_msg">
+<br class="gmail_msg">
+  assert(Other->getImportedOwningModule() &&<br class="gmail_msg">
+         "hidden, imported declaration has no owning module");<br class="gmail_msg">
<br class="gmail_msg">
   // Mark Def as the canonical definition of merged definition Other.<br class="gmail_msg">
   {<br class="gmail_msg">
<br class="gmail_msg">
<br class="gmail_msg">
_______________________________________________<br class="gmail_msg">
cfe-commits mailing list<br class="gmail_msg">
<a href="mailto:cfe-commits@lists.llvm.org" class="gmail_msg" target="_blank">cfe-commits@lists.llvm.org</a><br class="gmail_msg">
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" class="gmail_msg" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br class="gmail_msg">
</blockquote></div>