commit 33d88ea4f59912a927078cd72663ce7c87b1b8a9
author Richard Smith <richard-llvm@metafoo.co.uk> Fri Oct 14 02:35:11 2016 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Fri Oct 14 02:35:11 2016 +0000
tree 11110e5e6ad347855cad737e1eb084301c1d67f9
parent 4d968d356f70920367549b3abeccaf054b03a33f

Fix bogus assert breaking modules self-host.

llvm-svn: 284187

clang/lib/AST/ASTContext.cpp

diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index e1be749..709de43 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -907,11 +907,13 @@
   assert(Other->isFromASTFile() && "merge of non-imported decl not supported");
   assert(Def != Other && "merging definition into itself");
 
-  if (!getLangOpts().ModulesLocalVisibility && !Other->isHidden())
+  if (!Other->isHidden()) {
     Def->setHidden(false);
-  else
-    assert(Other->getImportedOwningModule() &&
-           "hidden, imported declaration has no owning module");
+    return;
+  }
+
+  assert(Other->getImportedOwningModule() &&
+         "hidden, imported declaration has no owning module");
 
   // Mark Def as the canonical definition of merged definition Other.
   {