mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-17 21:29:20 +00:00
Fix a major regression in my previous checkin
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@15486 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
cc7ba49d85
commit
868bbf35b0
@ -411,6 +411,8 @@ static bool LinkGlobals(Module *Dest, const Module *Src,
|
||||
GlobalsByName.find(SGV->getName());
|
||||
if (EGV != GlobalsByName.end())
|
||||
DGV = dyn_cast<GlobalVariable>(EGV->second);
|
||||
if (DGV && RecursiveResolveTypes(SGV->getType(), DGV->getType(), ST, ""))
|
||||
DGV = 0; // FIXME: gross.
|
||||
}
|
||||
|
||||
assert(SGV->hasInitializer() || SGV->hasExternalLinkage() &&
|
||||
@ -589,6 +591,8 @@ static bool LinkFunctionProtos(Module *Dest, const Module *Src,
|
||||
GlobalsByName.find(SF->getName());
|
||||
if (EF != GlobalsByName.end())
|
||||
DF = dyn_cast<Function>(EF->second);
|
||||
if (DF && RecursiveResolveTypes(SF->getType(), DF->getType(), ST, ""))
|
||||
DF = 0; // FIXME: gross.
|
||||
}
|
||||
|
||||
if (!DF || SF->hasInternalLinkage() || DF->hasInternalLinkage()) {
|
||||
|
@ -411,6 +411,8 @@ static bool LinkGlobals(Module *Dest, const Module *Src,
|
||||
GlobalsByName.find(SGV->getName());
|
||||
if (EGV != GlobalsByName.end())
|
||||
DGV = dyn_cast<GlobalVariable>(EGV->second);
|
||||
if (DGV && RecursiveResolveTypes(SGV->getType(), DGV->getType(), ST, ""))
|
||||
DGV = 0; // FIXME: gross.
|
||||
}
|
||||
|
||||
assert(SGV->hasInitializer() || SGV->hasExternalLinkage() &&
|
||||
@ -589,6 +591,8 @@ static bool LinkFunctionProtos(Module *Dest, const Module *Src,
|
||||
GlobalsByName.find(SF->getName());
|
||||
if (EF != GlobalsByName.end())
|
||||
DF = dyn_cast<Function>(EF->second);
|
||||
if (DF && RecursiveResolveTypes(SF->getType(), DF->getType(), ST, ""))
|
||||
DF = 0; // FIXME: gross.
|
||||
}
|
||||
|
||||
if (!DF || SF->hasInternalLinkage() || DF->hasInternalLinkage()) {
|
||||
|
Loading…
Reference in New Issue
Block a user