6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-08-17 21:29:20 +00:00
Code Issues Projects Releases Wiki Activity

Fix problem linking in a method prototype when a method body exists

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@965 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2001-10-23 20:43:42 +00:00
parent 2172ca1bab
commit c2d774b6c1
3 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Linker/LinkModules.cpp
View File

@ -294,12 +294,20 @@ static bool LinkMethodBodies(Module *Dest, const Module *Src,
// Loop over all of the methods in the src module, mapping them over as we go
//
for (Module::const_iterator I = Src->begin(), E = Src->end(); I != E; ++I) {
const Method *SM = *I; // Source Method
Method *DM = cast<Method>(ValueMap[SM]); // Destination method
const Method *SM = *I; // Source Method
if (!SM->isExternal()) { // No body if method is external
Method *DM = cast<Method>(ValueMap[SM]); // Destination method
// DM not external SM external?
if (!DM->isExternal()) {
if (Err)
*Err = "Method '" + (SM->hasName() ? SM->getName() : string("")) +
"' body multiply defined!";
return true;
}
assert(DM && DM->isExternal() && "LinkMethodProtos failed!");
if (!SM->isExternal()) // External methods are already done
if (LinkMethodBody(DM, SM, ValueMap, Err)) return true;
}
}
return false;
}

16
lib/Transforms/Utils/Linker.cpp
View File

@ -294,12 +294,20 @@ static bool LinkMethodBodies(Module *Dest, const Module *Src,
// Loop over all of the methods in the src module, mapping them over as we go
//
for (Module::const_iterator I = Src->begin(), E = Src->end(); I != E; ++I) {
const Method *SM = *I; // Source Method
Method *DM = cast<Method>(ValueMap[SM]); // Destination method
const Method *SM = *I; // Source Method
if (!SM->isExternal()) { // No body if method is external
Method *DM = cast<Method>(ValueMap[SM]); // Destination method
// DM not external SM external?
if (!DM->isExternal()) {
if (Err)
*Err = "Method '" + (SM->hasName() ? SM->getName() : string("")) +
"' body multiply defined!";
return true;
}
assert(DM && DM->isExternal() && "LinkMethodProtos failed!");
if (!SM->isExternal()) // External methods are already done
if (LinkMethodBody(DM, SM, ValueMap, Err)) return true;
}
}
return false;
}

16
lib/VMCore/Linker.cpp
View File

@ -294,12 +294,20 @@ static bool LinkMethodBodies(Module *Dest, const Module *Src,
// Loop over all of the methods in the src module, mapping them over as we go
//
for (Module::const_iterator I = Src->begin(), E = Src->end(); I != E; ++I) {
const Method *SM = *I; // Source Method
Method *DM = cast<Method>(ValueMap[SM]); // Destination method
const Method *SM = *I; // Source Method
if (!SM->isExternal()) { // No body if method is external
Method *DM = cast<Method>(ValueMap[SM]); // Destination method
// DM not external SM external?
if (!DM->isExternal()) {
if (Err)
*Err = "Method '" + (SM->hasName() ? SM->getName() : string("")) +
"' body multiply defined!";
return true;
}
assert(DM && DM->isExternal() && "LinkMethodProtos failed!");
if (!SM->isExternal()) // External methods are already done
if (LinkMethodBody(DM, SM, ValueMap, Err)) return true;
}
}
return false;
}