[llvm-commits] [llvm] r124650 - in /llvm/trunk: lib/Linker/LinkModules.cpp test/Linker/available_externally_a.ll test/Linker/available_externally_b.ll

[Rafael Espindola]

Author: rafael
Date: Mon Jan 31 23:33:52 2011
New Revision: 124650

URL: http://llvm.org/viewvc/llvm-project?rev=124650&view=rev
Log:
Correctly merge available_externally and regular definitions when they have
different visibilities.

Added:
    llvm/trunk/test/Linker/available_externally_a.ll
    llvm/trunk/test/Linker/available_externally_b.ll
Modified:
    llvm/trunk/lib/Linker/LinkModules.cpp

Modified: llvm/trunk/lib/Linker/LinkModules.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Linker/LinkModules.cpp?rev=124650&r1=124649&r2=124650&view=diff
==============================================================================
--- llvm/trunk/lib/Linker/LinkModules.cpp (original)
+++ llvm/trunk/lib/Linker/LinkModules.cpp Mon Jan 31 23:33:52 2011
@@ -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;

Added: llvm/trunk/test/Linker/available_externally_a.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/available_externally_a.ll?rev=124650&view=auto
==============================================================================
--- llvm/trunk/test/Linker/available_externally_a.ll (added)
+++ llvm/trunk/test/Linker/available_externally_a.ll Mon Jan 31 23:33:52 2011
@@ -0,0 +1,5 @@
+; RUN: llvm-link %s %p/available_externally_b.ll -S -o - | FileCheck %s
+
+ at foo = available_externally unnamed_addr constant i32 0
+
+; CHECK: @foo = hidden unnamed_addr constant i32 0

Added: llvm/trunk/test/Linker/available_externally_b.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/available_externally_b.ll?rev=124650&view=auto
==============================================================================
--- llvm/trunk/test/Linker/available_externally_b.ll (added)
+++ llvm/trunk/test/Linker/available_externally_b.ll Mon Jan 31 23:33:52 2011
@@ -0,0 +1,4 @@
+; This file is for use with available_externally_a.ll
+; RUN: true
+
+ at foo = hidden unnamed_addr constant i32 0