commit 4e93885bab8c3738fdad3286e99dc147157218e8
author Rafael Espindola <rafael.espindola@gmail.com> Tue Feb 01 05:33:52 2011 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Tue Feb 01 05:33:52 2011 +0000
tree 4396ae2b4f1b6bb28d39562abb0e13f8caa192d1
parent e087afa128211285ee41297fa5fc22fe5f2d3eb1

Correctly merge available_externally and regular definitions when they have
different visibilities.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@124650 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Linker/LinkModules.cpp

diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp
index ec39c93..5aa06ab 100644
--- a/lib/Linker/LinkModules.cpp
+++ b/lib/Linker/LinkModules.cpp
@@ -434,8 +434,10 @@
   }
 
   // Check visibility
-  if (Dest && Src->getVisibility() != Dest->getVisibility())
-    if (!Src->isDeclaration() && !Dest->isDeclaration())
+  if (Dest && Src->getVisibility() != Dest->getVisibility() &&
+      !Src->isDeclaration() && !Dest->isDeclaration() &&
+      !Src->hasAvailableExternallyLinkage() &&
+      !Dest->hasAvailableExternallyLinkage())
       return Error(Err, "Linking globals named '" + Src->getName() +
                    "': symbols have different visibilities!");
   return false;