mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-26 07:29:55 +00:00
simplify function visibility handling.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@52133 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
301d5b48cb
commit
bc3d1c7e4c
@ -827,18 +827,21 @@ static bool LinkFunctionProtos(Module *Dest, const Module *Src,
|
||||
&Dest->getTypeSymbolTable(), "");
|
||||
}
|
||||
|
||||
if (DF && DF->hasInternalLinkage())
|
||||
DF = NULL;
|
||||
|
||||
// Check visibility
|
||||
if (DF && !DF->hasInternalLinkage() &&
|
||||
SF->getVisibility() != DF->getVisibility()) {
|
||||
if (DF && 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->hasInternalLinkage())
|
||||
DF = NULL;
|
||||
// Otherwise, replace the visibility of DF if DF is a prototype.
|
||||
if (DF->isDeclaration())
|
||||
DF->setVisibility(SF->getVisibility());
|
||||
}
|
||||
|
||||
if (DF && DF->getType() != SF->getType()) {
|
||||
if (DF->isDeclaration() && !SF->isDeclaration()) {
|
||||
@ -911,8 +914,6 @@ static bool LinkFunctionProtos(Module *Dest, const Module *Src,
|
||||
// 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() ||
|
||||
SF->hasCommonLinkage()) {
|
||||
// At this point we know that DF has LinkOnce, Weak, or External* linkage.
|
||||
|
Loading…
Reference in New Issue
Block a user