X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FLinker%2FLinkModules.cpp;h=47aa5484e76ad7e9f691b681ccf8ebed304bbb3b;hb=8f77daef04355c00b78b645f5aae5694e7a8b631;hp=9637f747e28cbc2b1f56809eefb16c928623405b;hpb=87182ae6baf28ca6da6ee4bc00cf1857f293acfe;p=oota-llvm.git diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp index 9637f747e28..47aa5484e76 100644 --- a/lib/Linker/LinkModules.cpp +++ b/lib/Linker/LinkModules.cpp @@ -5,28 +5,21 @@ // Specifically, this: // * Merges global variables between the two modules // * Uninit + Uninit = Init, Init + Uninit = Init, Init + Init = Error if != -// * Merges methods between two modules +// * Merges functions between two modules // //===----------------------------------------------------------------------===// -#include "llvm/Transforms/Linker.h" +#include "llvm/Transforms/Utils/Linker.h" #include "llvm/Module.h" -#include "llvm/Function.h" -#include "llvm/BasicBlock.h" -#include "llvm/GlobalVariable.h" #include "llvm/SymbolTable.h" #include "llvm/DerivedTypes.h" #include "llvm/iOther.h" -#include "llvm/ConstantVals.h" -#include -using std::cerr; -using std::string; -using std::map; +#include "llvm/Constants.h" // Error - Simple wrapper function to conditionally assign to E and return true. // This just makes error return conditions a little bit simpler... // -static inline bool Error(string *E, string Message) { +static inline bool Error(std::string *E, std::string Message) { if (E) *E = Message; return true; } @@ -35,12 +28,9 @@ static inline bool Error(string *E, string Message) { // types are named in the src module that are not named in the Dst module. // Make sure there are no type name conflicts. // -static bool LinkTypes(Module *Dest, const Module *Src, string *Err = 0) { - // No symbol table? Can't have named types. - if (!Src->hasSymbolTable()) return false; - - SymbolTable *DestST = Dest->getSymbolTableSure(); - const SymbolTable *SrcST = Src->getSymbolTable(); +static bool LinkTypes(Module *Dest, const Module *Src, std::string *Err) { + SymbolTable *DestST = &Dest->getSymbolTable(); + const SymbolTable *SrcST = &Src->getSymbolTable(); // Look for a type plane for Type's... SymbolTable::const_iterator PI = SrcST->find(Type::TypeTy); @@ -49,18 +39,29 @@ static bool LinkTypes(Module *Dest, const Module *Src, string *Err = 0) { const SymbolTable::VarMap &VM = PI->second; for (SymbolTable::type_const_iterator I = VM.begin(), E = VM.end(); I != E; ++I) { - const string &Name = I->first; + const std::string &Name = I->first; const Type *RHS = cast(I->second); // Check to see if this type name is already in the dest module... const Type *Entry = cast_or_null(DestST->lookup(Type::TypeTy, Name)); - if (Entry) { // Yup, the value already exists... - if (Entry != RHS) // If it's the same, noop. Otherwise, error. - return Error(Err, "Type named '" + Name + - "' of different shape in modules.\n Src='" + - Entry->getDescription() + "'.\n Dst='" + - RHS->getDescription() + "'"); + if (Entry && !isa(Entry)) { // Yup, the value already exists... + if (Entry != RHS) { + if (OpaqueType *OT = dyn_cast(const_cast(RHS))) { + OT->refineAbstractTypeTo(Entry); + } else { + // If it's the same, noop. Otherwise, error. + return Error(Err, "Type named '" + Name + + "' of different shape in modules.\n Src='" + + Entry->getDescription() + "'.\n Dst='" + + RHS->getDescription() + "'"); + } + } } else { // Type not in dest module. Add it now. + if (Entry) { + OpaqueType *OT = cast(const_cast(Entry)); + OT->refineAbstractTypeTo(RHS); + } + // TODO: FIXME WHEN TYPES AREN'T CONST DestST->insert(Name, const_cast(RHS)); } @@ -68,14 +69,14 @@ static bool LinkTypes(Module *Dest, const Module *Src, string *Err = 0) { return false; } -static void PrintMap(const map &M) { - for (map::const_iterator I = M.begin(), E = M.end(); +static void PrintMap(const std::map &M) { + for (std::map::const_iterator I = M.begin(), E =M.end(); I != E; ++I) { - cerr << " Fr: " << (void*)I->first << " "; + std::cerr << " Fr: " << (void*)I->first << " "; I->first->dump(); - cerr << " To: " << (void*)I->second << " "; + std::cerr << " To: " << (void*)I->second << " "; I->second->dump(); - cerr << "\n"; + std::cerr << "\n"; } } @@ -84,9 +85,10 @@ static void PrintMap(const map &M) { // module to another. This is somewhat sophisticated in that it can // automatically handle constant references correctly as well... // -static Value *RemapOperand(const Value *In, map &LocalMap, - const map *GlobalMap = 0) { - map::const_iterator I = LocalMap.find(In); +static Value *RemapOperand(const Value *In, + std::map &LocalMap, + std::map *GlobalMap) { + std::map::const_iterator I = LocalMap.find(In); if (I != LocalMap.end()) return I->second; if (GlobalMap) { @@ -95,20 +97,20 @@ static Value *RemapOperand(const Value *In, map &LocalMap, } // Check to see if it's a constant that we are interesting in transforming... - if (Constant *CPV = dyn_cast(In)) { - if (!isa(CPV->getType())) - return CPV; // Simple constants stay identical... + if (const Constant *CPV = dyn_cast(In)) { + if (!isa(CPV->getType()) && !isa(CPV)) + return const_cast(CPV); // Simple constants stay identical... Constant *Result = 0; - if (ConstantArray *CPA = dyn_cast(CPV)) { + if (const ConstantArray *CPA = dyn_cast(CPV)) { const std::vector &Ops = CPA->getValues(); std::vector Operands(Ops.size()); - for (unsigned i = 0; i < Ops.size(); ++i) + for (unsigned i = 0, e = Ops.size(); i != e; ++i) Operands[i] = cast(RemapOperand(Ops[i], LocalMap, GlobalMap)); Result = ConstantArray::get(cast(CPA->getType()), Operands); - } else if (ConstantStruct *CPS = dyn_cast(CPV)) { + } else if (const ConstantStruct *CPS = dyn_cast(CPV)) { const std::vector &Ops = CPS->getValues(); std::vector Operands(Ops.size()); for (unsigned i = 0; i < Ops.size(); ++i) @@ -116,30 +118,58 @@ static Value *RemapOperand(const Value *In, map &LocalMap, cast(RemapOperand(Ops[i], LocalMap, GlobalMap)); Result = ConstantStruct::get(cast(CPS->getType()), Operands); } else if (isa(CPV)) { - Result = CPV; - } else if (ConstantPointerRef *CPR = dyn_cast(CPV)) { + Result = const_cast(CPV); + } else if (const ConstantPointerRef *CPR = + dyn_cast(CPV)) { Value *V = RemapOperand(CPR->getValue(), LocalMap, GlobalMap); Result = ConstantPointerRef::get(cast(V)); + } else if (const ConstantExpr *CE = dyn_cast(CPV)) { + if (CE->getOpcode() == Instruction::GetElementPtr) { + Value *Ptr = RemapOperand(CE->getOperand(0), LocalMap, GlobalMap); + std::vector Indices; + Indices.reserve(CE->getNumOperands()-1); + for (unsigned i = 1, e = CE->getNumOperands(); i != e; ++i) + Indices.push_back(cast(RemapOperand(CE->getOperand(i), + LocalMap, GlobalMap))); + + Result = ConstantExpr::getGetElementPtr(cast(Ptr), Indices); + } else if (CE->getNumOperands() == 1) { + // Cast instruction + assert(CE->getOpcode() == Instruction::Cast); + Value *V = RemapOperand(CE->getOperand(0), LocalMap, GlobalMap); + Result = ConstantExpr::getCast(cast(V), CE->getType()); + } else if (CE->getNumOperands() == 2) { + // Binary operator... + Value *V1 = RemapOperand(CE->getOperand(0), LocalMap, GlobalMap); + Value *V2 = RemapOperand(CE->getOperand(1), LocalMap, GlobalMap); + + Result = ConstantExpr::get(CE->getOpcode(), cast(V1), + cast(V2)); + } else { + assert(0 && "Unknown constant expr type!"); + } + } else { assert(0 && "Unknown type of derived type constant value!"); } // Cache the mapping in our local map structure... - LocalMap.insert(std::make_pair(In, CPV)); + if (GlobalMap) + GlobalMap->insert(std::make_pair(In, Result)); + else + LocalMap.insert(std::make_pair(In, Result)); return Result; } - cerr << "XXX LocalMap: \n"; + std::cerr << "XXX LocalMap: \n"; PrintMap(LocalMap); if (GlobalMap) { - cerr << "XXX GlobalMap: \n"; + std::cerr << "XXX GlobalMap: \n"; PrintMap(*GlobalMap); } - cerr << "Couldn't remap value: " << (void*)In << " "; - In->dump(); - cerr << "\n"; + std::cerr << "Couldn't remap value: " << (void*)In << " " << *In << "\n"; assert(0 && "Couldn't remap value!"); return 0; } @@ -149,51 +179,93 @@ static Value *RemapOperand(const Value *In, map &LocalMap, // them into the dest module... // static bool LinkGlobals(Module *Dest, const Module *Src, - map &ValueMap, string *Err = 0) { + std::map &ValueMap, + std::string *Err) { // We will need a module level symbol table if the src module has a module // level symbol table... - SymbolTable *ST = Src->getSymbolTable() ? Dest->getSymbolTableSure() : 0; + SymbolTable *ST = (SymbolTable*)&Dest->getSymbolTable(); // Loop over all of the globals in the src module, mapping them over as we go // for (Module::const_giterator I = Src->gbegin(), E = Src->gend(); I != E; ++I){ - const GlobalVariable *SGV = *I; - Value *V; - - // If the global variable has a name, and that name is already in use in the - // Dest module, make sure that the name is a compatible global variable... - // - if (SGV->hasExternalLinkage() && SGV->hasName() && - (V = ST->lookup(SGV->getType(), SGV->getName())) && - cast(V)->hasExternalLinkage()) { - // The same named thing is a global variable, because the only two things + const GlobalVariable *SGV = I; + GlobalVariable *DGV = 0; + if (SGV->hasName()) { + // A same named thing is a global variable, because the only two things // that may be in a module level symbol table are Global Vars and // Functions, and they both have distinct, nonoverlapping, possible types. // - GlobalVariable *DGV = cast(V); + DGV = cast_or_null(ST->lookup(SGV->getType(), + SGV->getName())); + } - // Check to see if the two GV's have the same Const'ness... - if (SGV->isConstant() != DGV->isConstant()) - return Error(Err, "Global Variable Collision on '" + - SGV->getType()->getDescription() + "':%" + SGV->getName() + - " - Global variables differ in const'ness"); + assert(SGV->hasInitializer() || SGV->hasExternalLinkage() && + "Global must either be external or have an initializer!"); - // Okay, everything is cool, remember the mapping... - ValueMap.insert(std::make_pair(SGV, DGV)); - } else { + bool SGExtern = SGV->isExternal(); + bool DGExtern = DGV ? DGV->isExternal() : false; + + if (!DGV || DGV->hasInternalLinkage() || SGV->hasInternalLinkage()) { // No linking to be performed, simply create an identical version of the // symbol over in the dest module... the initializer will be filled in // later by LinkGlobalInits... // - GlobalVariable *DGV = - new GlobalVariable(SGV->getType()->getElementType(), SGV->isConstant(), - SGV->hasInternalLinkage(), 0, SGV->getName()); - - // Add the new global to the dest module - Dest->getGlobalList().push_back(DGV); + GlobalVariable *NewDGV = + new GlobalVariable(SGV->getType()->getElementType(), + SGV->isConstant(), SGV->getLinkage(), /*init*/0, + SGV->getName(), Dest); + + // If the LLVM runtime renamed the global, but it is an externally visible + // symbol, DGV must be an existing global with internal linkage. Rename + // it. + if (NewDGV->getName() != SGV->getName() && !NewDGV->hasInternalLinkage()){ + assert(DGV && DGV->getName() == SGV->getName() && + DGV->hasInternalLinkage()); + DGV->setName(""); + NewDGV->setName(SGV->getName()); // Force the name back + DGV->setName(SGV->getName()); // This will cause a renaming + assert(NewDGV->getName() == SGV->getName() && + DGV->getName() != SGV->getName()); + } // Make sure to remember this mapping... + ValueMap.insert(std::make_pair(SGV, NewDGV)); + } else if (SGV->isExternal()) { + // If SGV is external or if both SGV & DGV are external.. Just link the + // external globals, we aren't adding anything. ValueMap.insert(std::make_pair(SGV, DGV)); + + } else if (DGV->isExternal()) { // If DGV is external but SGV is not... + ValueMap.insert(std::make_pair(SGV, DGV)); + DGV->setLinkage(SGV->getLinkage()); // Inherit linkage! + } else if (SGV->getLinkage() != DGV->getLinkage()) { + return Error(Err, "Global variables named '" + SGV->getName() + + "' have different linkage specifiers!"); + } else if (SGV->hasExternalLinkage()) { + // Allow linking two exactly identical external global variables... + if (SGV->isConstant() != DGV->isConstant() || + SGV->getInitializer() != DGV->getInitializer()) + return Error(Err, "Global Variable Collision on '" + + SGV->getType()->getDescription() + " %" + SGV->getName() + + "' - Global variables differ in const'ness"); + ValueMap.insert(std::make_pair(SGV, DGV)); + } else if (SGV->hasLinkOnceLinkage()) { + // If the global variable has a name, and that name is already in use in + // the Dest module, make sure that the name is a compatible global + // variable... + // + // Check to see if the two GV's have the same Const'ness... + if (SGV->isConstant() != DGV->isConstant()) + return Error(Err, "Global Variable Collision on '" + + SGV->getType()->getDescription() + " %" + SGV->getName() + + "' - Global variables differ in const'ness"); + + // Okay, everything is cool, remember the mapping... + ValueMap.insert(std::make_pair(SGV, DGV)); + } else if (SGV->hasAppendingLinkage()) { + assert(0 && "FIXME: Appending linkage unimplemented!"); + } else { + assert(0 && "Unknown linkage!"); } } return false; @@ -204,29 +276,38 @@ static bool LinkGlobals(Module *Dest, const Module *Src, // globals that may be referenced are in Dest. // static bool LinkGlobalInits(Module *Dest, const Module *Src, - map &ValueMap, - string *Err = 0) { + std::map &ValueMap, + std::string *Err) { // Loop over all of the globals in the src module, mapping them over as we go // for (Module::const_giterator I = Src->gbegin(), E = Src->gend(); I != E; ++I){ - const GlobalVariable *SGV = *I; + const GlobalVariable *SGV = I; if (SGV->hasInitializer()) { // Only process initialized GV's // Figure out what the initializer looks like in the dest module... - Constant *DInit = - cast(RemapOperand(SGV->getInitializer(), ValueMap)); + Constant *SInit = + cast(RemapOperand(SGV->getInitializer(), ValueMap, 0)); GlobalVariable *DGV = cast(ValueMap[SGV]); - if (DGV->hasInitializer() && SGV->hasExternalLinkage() && - DGV->hasExternalLinkage()) { - if (DGV->getInitializer() != DInit) - return Error(Err, "Global Variable Collision on '" + - SGV->getType()->getDescription() + "':%" +SGV->getName()+ - " - Global variables have different initializers"); + if (DGV->hasInitializer()) { + assert(SGV->getLinkage() == DGV->getLinkage()); + if (SGV->hasExternalLinkage()) { + if (DGV->getInitializer() != SInit) + return Error(Err, "Global Variable Collision on '" + + SGV->getType()->getDescription() +"':%"+SGV->getName()+ + " - Global variables have different initializers"); + } else if (DGV->hasLinkOnceLinkage()) { + // Nothing is required, mapped values will take the new global + // automatically. + } else if (DGV->hasAppendingLinkage()) { + assert(0 && "Appending linkage unimplemented!"); + } else { + assert(0 && "Unknown linkage!"); + } } else { // Copy the initializer over now... - DGV->setInitializer(DInit); + DGV->setInitializer(SInit); } } } @@ -234,91 +315,100 @@ static bool LinkGlobalInits(Module *Dest, const Module *Src, } // LinkFunctionProtos - Link the functions together between the two modules, -// without doing method bodies... this just adds external method prototypes to -// the Dest function... +// without doing function bodies... this just adds external function prototypes +// to the Dest function... // static bool LinkFunctionProtos(Module *Dest, const Module *Src, - map &ValueMap, - string *Err = 0) { - // We will need a module level symbol table if the src module has a module - // level symbol table... - SymbolTable *ST = Src->getSymbolTable() ? Dest->getSymbolTableSure() : 0; + std::map &ValueMap, + std::string *Err) { + SymbolTable *ST = (SymbolTable*)&Dest->getSymbolTable(); - // Loop over all of the methods in the src module, mapping them over as we go + // Loop over all of the functions in the src module, mapping them over as we + // go // for (Module::const_iterator I = Src->begin(), E = Src->end(); I != E; ++I) { - const Function *SM = *I; // SrcFunction - Value *V; - - // If the method has a name, and that name is already in use in the - // Dest module, make sure that the name is a compatible method... - // - if (SM->hasExternalLinkage() && SM->hasName() && - (V = ST->lookup(SM->getType(), SM->getName())) && - cast(V)->hasExternalLinkage()) { + const Function *SF = I; // SrcFunction + Function *DF = 0; + if (SF->hasName()) // The same named thing is a Function, because the only two things // that may be in a module level symbol table are Global Vars and // Functions, and they both have distinct, nonoverlapping, possible types. // - Function *DM = cast(V); // DestFunction - - // Check to make sure the method is not defined in both modules... - if (!SM->isExternal() && !DM->isExternal()) - return Error(Err, "Function '" + - SM->getFunctionType()->getDescription() + "':\"" + - SM->getName() + "\" - Function is already defined!"); - - // Otherwise, just remember this mapping... - ValueMap.insert(std::make_pair(SM, DM)); - } else { - // Function does not already exist, simply insert an external method - // signature identical to SM into the dest module... - Function *DM = new Function(SM->getFunctionType(), - SM->hasInternalLinkage(), - SM->getName()); - - // Add the method signature to the dest module... - Dest->getFunctionList().push_back(DM); + DF = cast_or_null(ST->lookup(SF->getType(), SF->getName())); + + if (!DF || SF->hasInternalLinkage() || DF->hasInternalLinkage()) { + // Function does not already exist, simply insert an function signature + // identical to SF into the dest module... + Function *NewDF = new Function(SF->getFunctionType(), SF->getLinkage(), + SF->getName(), Dest); + + // If the LLVM runtime renamed the function, but it is an externally + // visible symbol, DF must be an existing function with internal linkage. + // Rename it. + if (NewDF->getName() != SF->getName() && !NewDF->hasInternalLinkage()) { + assert(DF && DF->getName() == SF->getName() &&DF->hasInternalLinkage()); + DF->setName(""); + NewDF->setName(SF->getName()); // Force the name back + DF->setName(SF->getName()); // This will cause a renaming + assert(NewDF->getName() == SF->getName() && + DF->getName() != SF->getName()); + } // ... and remember this mapping... - ValueMap.insert(std::make_pair(SM, DM)); + ValueMap.insert(std::make_pair(SF, NewDF)); + } else if (SF->isExternal()) { + // If SF is external or if both SF & DF are external.. Just link the + // external functions, we aren't adding anything. + ValueMap.insert(std::make_pair(SF, DF)); + } else if (DF->isExternal()) { // If DF is external but SF is not... + // Link the external functions, update linkage qualifiers + ValueMap.insert(std::make_pair(SF, DF)); + DF->setLinkage(SF->getLinkage()); + + } else if (SF->getLinkage() != DF->getLinkage()) { + return Error(Err, "Functions named '" + SF->getName() + + "' have different linkage specifiers!"); + } else if (SF->hasExternalLinkage()) { + // The function is defined in both modules!! + return Error(Err, "Function '" + + SF->getFunctionType()->getDescription() + "':\"" + + SF->getName() + "\" - Function is already defined!"); + } else if (SF->hasLinkOnceLinkage()) { + // Completely ignore the source function. + ValueMap.insert(std::make_pair(SF, DF)); + } else { + assert(0 && "Unknown linkage configuration found!"); } } return false; } -// LinkFunctionBody - Copy the source method over into the dest method -// and fix up references to values. At this point we know that Dest -// is an external method, and that Src is not. +// LinkFunctionBody - Copy the source function over into the dest function and +// fix up references to values. At this point we know that Dest is an external +// function, and that Src is not. // static bool LinkFunctionBody(Function *Dest, const Function *Src, - const map &GlobalMap, - string *Err = 0) { + std::map &GlobalMap, + std::string *Err) { assert(Src && Dest && Dest->isExternal() && !Src->isExternal()); - map LocalMap; // Map for method local values + std::map LocalMap; // Map for function local values - // Go through and convert method arguments over... - for (Function::ArgumentListType::const_iterator - I = Src->getArgumentList().begin(), - E = Src->getArgumentList().end(); I != E; ++I) { - const FunctionArgument *SMA = *I; - - // Create the new method argument and add to the dest method... - FunctionArgument *DMA = new FunctionArgument(SMA->getType(),SMA->getName()); - Dest->getArgumentList().push_back(DMA); + // Go through and convert function arguments over... + Function::aiterator DI = Dest->abegin(); + for (Function::const_aiterator I = Src->abegin(), E = Src->aend(); + I != E; ++I, ++DI) { + DI->setName(I->getName()); // Copy the name information over... // Add a mapping to our local map - LocalMap.insert(std::make_pair(SMA, DMA)); + LocalMap.insert(std::make_pair(I, DI)); } // Loop over all of the basic blocks, copying the instructions over... // for (Function::const_iterator I = Src->begin(), E = Src->end(); I != E; ++I) { - const BasicBlock *SBB = *I; - - // Create new basic block and add to mapping and the Dest method... - BasicBlock *DBB = new BasicBlock(SBB->getName(), Dest); - LocalMap.insert(std::make_pair(SBB, DBB)); + // Create new basic block and add to mapping and the Dest function... + BasicBlock *DBB = new BasicBlock(I->getName(), Dest); + LocalMap.insert(std::make_pair(I, DBB)); // Loop over all of the instructions in the src basic block, copying them // over. Note that this is broken in a strict sense because the cloned @@ -326,61 +416,55 @@ static bool LinkFunctionBody(Function *Dest, const Function *Src, // the remapped values. In our case, however, we will not get caught and // so we can delay patching the values up until later... // - for (BasicBlock::const_iterator II = SBB->begin(), IE = SBB->end(); + for (BasicBlock::const_iterator II = I->begin(), IE = I->end(); II != IE; ++II) { - const Instruction *SI = *II; - Instruction *DI = SI->clone(); - DI->setName(SI->getName()); + Instruction *DI = II->clone(); + DI->setName(II->getName()); DBB->getInstList().push_back(DI); - LocalMap.insert(std::make_pair(SI, DI)); + LocalMap.insert(std::make_pair(II, DI)); } } - // At this point, all of the instructions and values of the method are now - // copied over. The only problem is that they are still referencing values - // in the Source method as operands. Loop through all of the operands of the - // methods and patch them up to point to the local versions... + // At this point, all of the instructions and values of the function are now + // copied over. The only problem is that they are still referencing values in + // the Source function as operands. Loop through all of the operands of the + // functions and patch them up to point to the local versions... // - for (Function::iterator BI = Dest->begin(), BE = Dest->end(); - BI != BE; ++BI) { - BasicBlock *BB = *BI; - for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; ++I) { - Instruction *Inst = *I; - - for (Instruction::op_iterator OI = Inst->op_begin(), OE = Inst->op_end(); + for (Function::iterator BB = Dest->begin(), BE = Dest->end(); BB != BE; ++BB) + for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; ++I) + for (Instruction::op_iterator OI = I->op_begin(), OE = I->op_end(); OI != OE; ++OI) *OI = RemapOperand(*OI, LocalMap, &GlobalMap); - } - } return false; } -// LinkFunctionBodies - Link in the method bodies that are defined in the source -// module into the DestModule. This consists basically of copying the method -// over and fixing up references to values. +// LinkFunctionBodies - Link in the function bodies that are defined in the +// source module into the DestModule. This consists basically of copying the +// function over and fixing up references to values. // static bool LinkFunctionBodies(Module *Dest, const Module *Src, - map &ValueMap, - string *Err = 0) { + std::map &ValueMap, + std::string *Err) { - // Loop over all of the methods in the src module, mapping them over as we go + // Loop over all of the functions in the src module, mapping them over as we + // go // - for (Module::const_iterator I = Src->begin(), E = Src->end(); I != E; ++I) { - const Function *SM = *I; // Source Function - if (!SM->isExternal()) { // No body if method is external - Function *DM = cast(ValueMap[SM]); // Destination method + for (Module::const_iterator SF = Src->begin(), E = Src->end(); SF != E; ++SF){ + if (!SF->isExternal()) { // No body if function is external + Function *DF = cast(ValueMap[SF]); // Destination function - // DM not external SM external? - if (!DM->isExternal()) { + // DF not external SF external? + if (!DF->isExternal()) { + if (DF->hasLinkOnceLinkage()) continue; // No relinkage for link-once! if (Err) - *Err = "Function '" + (SM->hasName() ? SM->getName() : string("")) + - "' body multiply defined!"; + *Err = "Function '" + (SF->hasName() ? SF->getName() :std::string("")) + + "' body multiply defined!"; return true; } - if (LinkFunctionBody(DM, SM, ValueMap, Err)) return true; + if (LinkFunctionBody(DF, SF, ValueMap, Err)) return true; } } return false; @@ -394,7 +478,11 @@ static bool LinkFunctionBodies(Module *Dest, const Module *Src, // the problem. Upon failure, the Dest module could be in a modified state, and // shouldn't be relied on to be consistent. // -bool LinkModules(Module *Dest, const Module *Src, string *ErrorMsg = 0) { +bool LinkModules(Module *Dest, const Module *Src, std::string *ErrorMsg) { + if (Dest->getEndianness() != Src->getEndianness()) + std::cerr << "WARNING: Linking two modules of different endianness!\n"; + if (Dest->getPointerSize() != Src->getPointerSize()) + std::cerr << "WARNING: Linking two modules of different pointer size!\n"; // LinkTypes - Go through the symbol table of the Src module and see if any // types are named in the src module that are not named in the Dst module. @@ -405,27 +493,28 @@ bool LinkModules(Module *Dest, const Module *Src, string *ErrorMsg = 0) { // ValueMap - Mapping of values from what they used to be in Src, to what they // are now in Dest. // - map ValueMap; + std::map ValueMap; // Insert all of the globals in src into the Dest module... without // initializers if (LinkGlobals(Dest, Src, ValueMap, ErrorMsg)) return true; + // Link the functions together between the two modules, without doing function + // bodies... this just adds external function prototypes to the Dest + // function... We do this so that when we begin processing function bodies, + // all of the global values that may be referenced are available in our + // ValueMap. + // + if (LinkFunctionProtos(Dest, Src, ValueMap, ErrorMsg)) return true; + // Update the initializers in the Dest module now that all globals that may // be referenced are in Dest. // if (LinkGlobalInits(Dest, Src, ValueMap, ErrorMsg)) return true; - // Link the methods together between the two modules, without doing method - // bodies... this just adds external method prototypes to the Dest method... - // We do this so that when we begin processing method bodies, all of the - // global values that may be referenced are available in our ValueMap. - // - if (LinkFunctionProtos(Dest, Src, ValueMap, ErrorMsg)) return true; - - // Link in the method bodies that are defined in the source module into the - // DestModule. This consists basically of copying the method over and fixing - // up references to values. + // Link in the function bodies that are defined in the source module into the + // DestModule. This consists basically of copying the function over and + // fixing up references to values. // if (LinkFunctionBodies(Dest, Src, ValueMap, ErrorMsg)) return true;