Fix PR1611 - Visibility should be ignored for a declaration
when a definition's visibility is different. Likewise, the
visibility of two declarations mismatching is not an error.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@41174 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp
index 462a4b7..85caa20 100644
--- a/lib/Linker/LinkModules.cpp
+++ b/lib/Linker/LinkModules.cpp
@@ -440,8 +440,9 @@
// Check visibility
if (Dest && Src->getVisibility() != Dest->getVisibility())
- return Error(Err, "Linking globals named '" + Src->getName() +
- "': symbols have different visibilities!");
+ if (!Src->isDeclaration() && !Dest->isDeclaration())
+ return Error(Err, "Linking globals named '" + Src->getName() +
+ "': symbols have different visibilities!");
return false;
}
@@ -651,9 +652,13 @@
// Check visibility
if (DF && !DF->hasInternalLinkage() &&
- SF->getVisibility() != DF->getVisibility())
- return Error(Err, "Linking functions named '" + SF->getName() +
- "': symbols have different visibilities!");
+ SF->getVisibility() != DF->getVisibility()) {
+ // If one is a prototype, ignore its visibility. Prototypes are always
+ // overridden by the definition.
+ if (!SF->isDeclaration() && !DF->isDeclaration())
+ return Error(Err, "Linking functions named '" + SF->getName() +
+ "': symbols have different visibilities!");
+ }
if (DF && DF->getType() != SF->getType()) {
if (DF->isDeclaration() && !SF->isDeclaration()) {
@@ -695,7 +700,7 @@
}
} else if (!DF || SF->hasInternalLinkage() || DF->hasInternalLinkage()) {
// Function does not already exist, simply insert an function signature
- // identical to SF into the dest module...
+ // identical to SF into the dest module.
Function *NewDF = new Function(SF->getFunctionType(), SF->getLinkage(),
SF->getName(), Dest);
CopyGVAttributes(NewDF, SF);
@@ -724,6 +729,8 @@
// Link the external functions, update linkage qualifiers
ValueMap.insert(std::make_pair(SF, DF));
DF->setLinkage(SF->getLinkage());
+ // Visibility of prototype is overridden by vis of definition.
+ DF->setVisibility(SF->getVisibility());
} else if (SF->hasWeakLinkage() || SF->hasLinkOnceLinkage()) {
// At this point we know that DF has LinkOnce, Weak, or External* linkage.
ValueMap.insert(std::make_pair(SF, DF));