don't do any linkage, not even type resolution, of symbols that have

internal linkage.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@53547 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2008-07-14 06:52:19 +00:00
parent d1ec48c641
commit ae1132d2b8

View File

@ -548,13 +548,15 @@ static bool LinkGlobals(Module *Dest, const Module *Src,
DGV = cast_or_null<GlobalValue>(DestSymTab.lookup(SGV->getNameStart(), DGV = cast_or_null<GlobalValue>(DestSymTab.lookup(SGV->getNameStart(),
SGV->getNameEnd())); SGV->getNameEnd()));
// If we found a global with the same name in the dest module, but it has
// internal linkage, we are really not doing any linkage here.
if (DGV && DGV->hasInternalLinkage())
DGV = 0;
// If types don't agree due to opaque types, try to resolve them. // If types don't agree due to opaque types, try to resolve them.
if (DGV && DGV->getType() != SGV->getType()) if (DGV && DGV->getType() != SGV->getType())
RecursiveResolveTypes(SGV->getType(), DGV->getType()); RecursiveResolveTypes(SGV->getType(), DGV->getType());
if (DGV && DGV->hasInternalLinkage())
DGV = 0;
assert((SGV->hasInitializer() || SGV->hasExternalWeakLinkage() || assert((SGV->hasInitializer() || SGV->hasExternalWeakLinkage() ||
SGV->hasExternalLinkage() || SGV->hasDLLImportLinkage()) && SGV->hasExternalLinkage() || SGV->hasDLLImportLinkage()) &&
"Global must either be external or have an initializer!"); "Global must either be external or have an initializer!");
@ -901,13 +903,15 @@ static bool LinkFunctionProtos(Module *Dest, const Module *Src,
DGV = cast_or_null<GlobalValue>(DestSymTab.lookup(SF->getNameStart(), DGV = cast_or_null<GlobalValue>(DestSymTab.lookup(SF->getNameStart(),
SF->getNameEnd())); SF->getNameEnd()));
// If we found a global with the same name in the dest module, but it has
// internal linkage, we are really not doing any linkage here.
if (DGV && DGV->hasInternalLinkage())
DGV = 0;
// If types don't agree due to opaque types, try to resolve them. // If types don't agree due to opaque types, try to resolve them.
if (DGV && DGV->getType() != SF->getType()) if (DGV && DGV->getType() != SF->getType())
RecursiveResolveTypes(SF->getType(), DGV->getType()); RecursiveResolveTypes(SF->getType(), DGV->getType());
if (DGV && DGV->hasInternalLinkage())
DGV = 0;
// If there is no linkage to be performed, just bring over SF without // If there is no linkage to be performed, just bring over SF without
// modifying it. // modifying it.
if (DGV == 0) { if (DGV == 0) {