X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FLinker%2FLinkModules.cpp;h=0d65ddd1dd9564c6e71d326fe746cc99a7d349b7;hb=b9476d9b45025905146f40370056a985f305bc8e;hp=5eadc388b6d8ac9f141242196987af92a04b6336;hpb=cc7ba49d85b66955516ff0d9574a70e1637dea36;p=oota-llvm.git diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp index 5eadc388b6d..0d65ddd1dd9 100644 --- a/lib/Linker/LinkModules.cpp +++ b/lib/Linker/LinkModules.cpp @@ -1,4 +1,4 @@ -//===- Linker.cpp - Module Linker Implementation --------------------------===// +//===- lib/Linker/LinkModules.cpp - Module Linker Implementation ----------===// // // The LLVM Compiler Infrastructure // @@ -16,25 +16,32 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Support/Linker.h" +#include "llvm/Linker.h" #include "llvm/Constants.h" #include "llvm/DerivedTypes.h" #include "llvm/Module.h" #include "llvm/SymbolTable.h" #include "llvm/Instructions.h" #include "llvm/Assembly/Writer.h" +#include "llvm/System/Path.h" #include - +#include using namespace llvm; // 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(std::string *E, const std::string &Message) { if (E) *E = Message; return true; } +// ToStr - Simple wrapper function to convert a type to a string. +static std::string ToStr(const Type *Ty, const Module *M) { + std::ostringstream OS; + WriteTypeSymbolic(OS, Ty, M); + return OS.str(); +} + // // Function: ResolveTypes() // @@ -84,7 +91,6 @@ static const StructType *getST(const PATypeHolder &TH) { // RecursiveResolveTypes - This is just like ResolveTypes, except that it // recurses down into derived types, merging the used types if the parent types // are compatible. -// static bool RecursiveResolveTypesI(const PATypeHolder &DestTy, const PATypeHolder &SrcTy, SymbolTable *DestST, const std::string &Name, @@ -138,7 +144,6 @@ static bool RecursiveResolveTypesI(const PATypeHolder &DestTy, // so, we are in a recursive branch. Cut off the search now. We cannot use // an associative container for this search, because the type pointers (keys // in the container) change whenever types get resolved... - // for (unsigned i = 0, e = Pointers.size(); i != e; ++i) if (Pointers[i].first == DestTy) return Pointers[i].second != SrcTy; @@ -168,7 +173,6 @@ static bool RecursiveResolveTypes(const PATypeHolder &DestTy, // 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. // Make sure there are no type name conflicts. -// static bool LinkTypes(Module *Dest, const Module *Src, std::string *Err) { SymbolTable *DestST = &Dest->getSymbolTable(); const SymbolTable *SrcST = &Src->getSymbolTable(); @@ -233,19 +237,7 @@ static bool LinkTypes(Module *Dest, const Module *Src, std::string *Err) { } // If we STILL cannot resolve the types, then there is something wrong. - // Report the warning and delete one of the names. if (DelayedTypesToResolve.size() == OldSize) { - const std::string &Name = DelayedTypesToResolve.back(); - - const Type *T1 = SrcST->lookupType(Name); - const Type *T2 = DestST->lookupType(Name); - std::cerr << "WARNING: Type conflict between types named '" << Name - << "'.\n Src='"; - WriteTypeSymbolic(std::cerr, T1, Src); - std::cerr << "'.\n Dest='"; - WriteTypeSymbolic(std::cerr, T2, Dest); - std::cerr << "'\n"; - // Remove the symbol name from the destination. DelayedTypesToResolve.pop_back(); } @@ -268,72 +260,63 @@ static void PrintMap(const std::map &M) { } -// RemapOperand - Use LocalMap and GlobalMap to convert references from one -// module to another. This is somewhat sophisticated in that it can -// automatically handle constant references correctly as well... -// +// RemapOperand - Use ValueMap to convert references from one module to another. +// This is somewhat sophisticated in that it can automatically handle constant +// references correctly as well... 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) { - I = GlobalMap->find(In); - if (I != GlobalMap->end()) return I->second; - } + std::map &ValueMap) { + std::map::const_iterator I = ValueMap.find(In); + if (I != ValueMap.end()) return I->second; - // Check to see if it's a constant that we are interesting in transforming... + // Check to see if it's a constant that we are interesting in transforming. if (const Constant *CPV = dyn_cast(In)) { if ((!isa(CPV->getType()) && !isa(CPV)) || isa(CPV)) - return const_cast(CPV); // Simple constants stay identical... + return const_cast(CPV); // Simple constants stay identical. Constant *Result = 0; if (const ConstantArray *CPA = dyn_cast(CPV)) { std::vector Operands(CPA->getNumOperands()); for (unsigned i = 0, e = CPA->getNumOperands(); i != e; ++i) - Operands[i] = - cast(RemapOperand(CPA->getOperand(i), LocalMap, GlobalMap)); + Operands[i] =cast(RemapOperand(CPA->getOperand(i), ValueMap)); Result = ConstantArray::get(cast(CPA->getType()), Operands); } else if (const ConstantStruct *CPS = dyn_cast(CPV)) { std::vector Operands(CPS->getNumOperands()); for (unsigned i = 0, e = CPS->getNumOperands(); i != e; ++i) - Operands[i] = - cast(RemapOperand(CPS->getOperand(i), LocalMap, GlobalMap)); + Operands[i] =cast(RemapOperand(CPS->getOperand(i), ValueMap)); Result = ConstantStruct::get(cast(CPS->getType()), Operands); - } else if (isa(CPV)) { + } else if (isa(CPV) || isa(CPV)) { Result = const_cast(CPV); } else if (isa(CPV)) { - Result = cast(RemapOperand(CPV, LocalMap, GlobalMap)); + Result = cast(RemapOperand(CPV, ValueMap)); } else if (const ConstantExpr *CE = dyn_cast(CPV)) { if (CE->getOpcode() == Instruction::GetElementPtr) { - Value *Ptr = RemapOperand(CE->getOperand(0), LocalMap, GlobalMap); + Value *Ptr = RemapOperand(CE->getOperand(0), ValueMap); 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))); + ValueMap))); 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); + Value *V = RemapOperand(CE->getOperand(0), ValueMap); Result = ConstantExpr::getCast(cast(V), CE->getType()); } else if (CE->getNumOperands() == 3) { // Select instruction assert(CE->getOpcode() == Instruction::Select); - Value *V1 = RemapOperand(CE->getOperand(0), LocalMap, GlobalMap); - Value *V2 = RemapOperand(CE->getOperand(1), LocalMap, GlobalMap); - Value *V3 = RemapOperand(CE->getOperand(2), LocalMap, GlobalMap); + Value *V1 = RemapOperand(CE->getOperand(0), ValueMap); + Value *V2 = RemapOperand(CE->getOperand(1), ValueMap); + Value *V3 = RemapOperand(CE->getOperand(2), ValueMap); Result = ConstantExpr::getSelect(cast(V1), cast(V2), cast(V3)); } else if (CE->getNumOperands() == 2) { // Binary operator... - Value *V1 = RemapOperand(CE->getOperand(0), LocalMap, GlobalMap); - Value *V2 = RemapOperand(CE->getOperand(1), LocalMap, GlobalMap); + Value *V1 = RemapOperand(CE->getOperand(0), ValueMap); + Value *V2 = RemapOperand(CE->getOperand(1), ValueMap); Result = ConstantExpr::get(CE->getOpcode(), cast(V1), cast(V2)); @@ -346,20 +329,12 @@ static Value *RemapOperand(const Value *In, } // Cache the mapping in our local map structure... - if (GlobalMap) - GlobalMap->insert(std::make_pair(In, Result)); - else - LocalMap.insert(std::make_pair(In, Result)); + ValueMap.insert(std::make_pair(In, Result)); return Result; } - std::cerr << "XXX LocalMap: \n"; - PrintMap(LocalMap); - - if (GlobalMap) { - std::cerr << "XXX GlobalMap: \n"; - PrintMap(*GlobalMap); - } + std::cerr << "LinkModules ValueMap: \n"; + PrintMap(ValueMap); std::cerr << "Couldn't remap value: " << (void*)In << " " << *In << "\n"; assert(0 && "Couldn't remap value!"); @@ -387,11 +362,60 @@ static void ForceRenaming(GlobalValue *GV, const std::string &Name) { "ForceRenaming didn't work"); } +/// GetLinkageResult - This analyzes the two global values and determines what +/// the result will look like in the destination module. In particular, it +/// computes the resultant linkage type, computes whether the global in the +/// source should be copied over to the destination (replacing the existing +/// one), and computes whether this linkage is an error or not. +static bool GetLinkageResult(GlobalValue *Dest, GlobalValue *Src, + GlobalValue::LinkageTypes <, bool &LinkFromSrc, + std::string *Err) { + assert((!Dest || !Src->hasInternalLinkage()) && + "If Src has internal linkage, Dest shouldn't be set!"); + if (!Dest) { + // Linking something to nothing. + LinkFromSrc = true; + LT = Src->getLinkage(); + } else if (Src->isExternal()) { + // If Src is external or if both Src & Drc are external.. Just link the + // external globals, we aren't adding anything. + LinkFromSrc = false; + LT = Dest->getLinkage(); + } else if (Dest->isExternal()) { + // If Dest is external but Src is not: + LinkFromSrc = true; + LT = Src->getLinkage(); + } else if (Src->hasAppendingLinkage() || Dest->hasAppendingLinkage()) { + if (Src->getLinkage() != Dest->getLinkage()) + return Error(Err, "Linking globals named '" + Src->getName() + + "': can only link appending global with another appending global!"); + LinkFromSrc = true; // Special cased. + LT = Src->getLinkage(); + } else if (Src->hasWeakLinkage() || Src->hasLinkOnceLinkage()) { + // At this point we know that Dest has LinkOnce, External or Weak linkage. + if (Dest->hasLinkOnceLinkage() && Src->hasWeakLinkage()) { + LinkFromSrc = true; + LT = Src->getLinkage(); + } else { + LinkFromSrc = false; + LT = Dest->getLinkage(); + } + } else if (Dest->hasWeakLinkage() || Dest->hasLinkOnceLinkage()) { + // At this point we know that Src has External linkage. + LinkFromSrc = true; + LT = GlobalValue::ExternalLinkage; + } else { + assert(Dest->hasExternalLinkage() && Src->hasExternalLinkage() && + "Unexpected linkage type!"); + return Error(Err, "Linking globals named '" + Src->getName() + + "': symbol multiply defined!"); + } + return false; +} // LinkGlobals - Loop through the global variables in the src module and merge // them into the dest module. -// -static bool LinkGlobals(Module *Dest, const Module *Src, +static bool LinkGlobals(Module *Dest, Module *Src, std::map &ValueMap, std::multimap &AppendingVars, std::map &GlobalsByName, @@ -401,29 +425,37 @@ static bool LinkGlobals(Module *Dest, const Module *Src, 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; + for (Module::giterator I = Src->gbegin(), E = Src->gend(); I != E; ++I) { + GlobalVariable *SGV = I; GlobalVariable *DGV = 0; // Check to see if may have to link the global. - if (SGV->hasName() && !SGV->hasInternalLinkage()) { - std::map::iterator EGV = - GlobalsByName.find(SGV->getName()); - if (EGV != GlobalsByName.end()) - DGV = dyn_cast(EGV->second); - } + if (SGV->hasName() && !SGV->hasInternalLinkage()) + if (!(DGV = Dest->getGlobalVariable(SGV->getName(), + SGV->getType()->getElementType()))) { + std::map::iterator EGV = + GlobalsByName.find(SGV->getName()); + if (EGV != GlobalsByName.end()) + DGV = dyn_cast(EGV->second); + if (DGV) + // If types don't agree due to opaque types, try to resolve them. + RecursiveResolveTypes(SGV->getType(), DGV->getType(),ST, ""); + } + + if (DGV && DGV->hasInternalLinkage()) + DGV = 0; assert(SGV->hasInitializer() || SGV->hasExternalLinkage() && "Global must either be external or have an initializer!"); - bool SGExtern = SGV->isExternal(); - bool DGExtern = DGV ? DGV->isExternal() : false; + GlobalValue::LinkageTypes NewLinkage; + bool LinkFromSrc; + if (GetLinkageResult(DGV, SGV, NewLinkage, LinkFromSrc, Err)) + return true; - if (!DGV || DGV->hasInternalLinkage() || SGV->hasInternalLinkage()) { + if (!DGV) { // 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 *NewDGV = new GlobalVariable(SGV->getType()->getElementType(), SGV->isConstant(), SGV->getLinkage(), /*init*/0, @@ -440,67 +472,7 @@ static bool LinkGlobals(Module *Dest, const Module *Src, if (SGV->hasAppendingLinkage()) // Keep track that this is an appending variable... AppendingVars.insert(std::make_pair(SGV->getName(), 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->hasWeakLinkage() || SGV->hasLinkOnceLinkage()) { - // At this point we know that DGV has LinkOnce, Appending, Weak, or - // External linkage. If DGV is Appending, this is an error. - if (DGV->hasAppendingLinkage()) - return Error(Err, "Linking globals named '" + SGV->getName() + - " ' with 'weak' and 'appending' linkage is not allowed!"); - - if (SGV->isConstant() != DGV->isConstant()) - return Error(Err, "Global Variable Collision on '" + - SGV->getType()->getDescription() + " %" + SGV->getName() + - "' - Global variables differ in const'ness"); - - // Otherwise, just perform the link. - ValueMap.insert(std::make_pair(SGV, DGV)); - - // Linkonce+Weak = Weak - if (DGV->hasLinkOnceLinkage() && SGV->hasWeakLinkage()) - DGV->setLinkage(SGV->getLinkage()); - - } else if (DGV->hasWeakLinkage() || DGV->hasLinkOnceLinkage()) { - // At this point we know that SGV has LinkOnce, Appending, or External - // linkage. If SGV is Appending, this is an error. - if (SGV->hasAppendingLinkage()) - return Error(Err, "Linking globals named '" + SGV->getName() + - " ' with 'weak' and 'appending' linkage is not allowed!"); - - if (SGV->isConstant() != DGV->isConstant()) - return Error(Err, "Global Variable Collision on '" + - SGV->getType()->getDescription() + " %" + SGV->getName() + - "' - Global variables differ in const'ness"); - - if (!SGV->hasLinkOnceLinkage()) - DGV->setLinkage(SGV->getLinkage()); // Inherit linkage! - ValueMap.insert(std::make_pair(SGV, DGV)); - - } 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()) - return Error(Err, "Global Variable Collision on '" + - SGV->getType()->getDescription() + " %" + SGV->getName() + - "' - Global variables differ in const'ness"); - - if (SGV->getInitializer() != DGV->getInitializer()) - return Error(Err, "Global Variable Collision on '" + - SGV->getType()->getDescription() + " %" + SGV->getName() + - "' - External linkage globals have different initializers"); - - ValueMap.insert(std::make_pair(SGV, DGV)); - } else if (SGV->hasAppendingLinkage()) { + } else if (DGV->hasAppendingLinkage()) { // No linking is performed yet. Just insert a new copy of the global, and // keep track of the fact that it is an appending variable in the // AppendingVars map. The name is cleared out so that no linkage is @@ -516,7 +488,38 @@ static bool LinkGlobals(Module *Dest, const Module *Src, // Keep track that this is an appending variable... AppendingVars.insert(std::make_pair(SGV->getName(), NewDGV)); } else { - assert(0 && "Unknown linkage!"); + // Otherwise, perform the mapping as instructed by GetLinkageResult. If + // the types don't match, and if we are to link from the source, nuke DGV + // and create a new one of the appropriate type. + if (SGV->getType() != DGV->getType() && LinkFromSrc) { + GlobalVariable *NewDGV = + new GlobalVariable(SGV->getType()->getElementType(), + DGV->isConstant(), DGV->getLinkage()); + Dest->getGlobalList().insert(DGV, NewDGV); + DGV->replaceAllUsesWith(ConstantExpr::getCast(NewDGV, DGV->getType())); + DGV->eraseFromParent(); + NewDGV->setName(SGV->getName()); + DGV = NewDGV; + } + + DGV->setLinkage(NewLinkage); + + if (LinkFromSrc) { + // Inherit const as appropriate + DGV->setConstant(SGV->isConstant()); + DGV->setInitializer(0); + } else { + if (SGV->isConstant() && !DGV->isConstant()) { + if (DGV->isExternal()) + DGV->setConstant(true); + } + SGV->setLinkage(GlobalValue::ExternalLinkage); + SGV->setInitializer(0); + } + + ValueMap.insert(std::make_pair(SGV, + ConstantExpr::getCast(DGV, + SGV->getType()))); } } return false; @@ -525,27 +528,25 @@ static bool LinkGlobals(Module *Dest, const Module *Src, // LinkGlobalInits - Update the initializers in the Dest module now that all // globals that may be referenced are in Dest. -// static bool LinkGlobalInits(Module *Dest, const Module *Src, 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; if (SGV->hasInitializer()) { // Only process initialized GV's // Figure out what the initializer looks like in the dest module... Constant *SInit = - cast(RemapOperand(SGV->getInitializer(), ValueMap, 0)); + cast(RemapOperand(SGV->getInitializer(), ValueMap)); GlobalVariable *DGV = cast(ValueMap[SGV]); if (DGV->hasInitializer()) { if (SGV->hasExternalLinkage()) { if (DGV->getInitializer() != SInit) return Error(Err, "Global Variable Collision on '" + - SGV->getType()->getDescription() +"':%"+SGV->getName()+ + ToStr(SGV->getType(), Src) +"':%"+SGV->getName()+ " - Global variables have different initializers"); } else if (DGV->hasLinkOnceLinkage() || DGV->hasWeakLinkage()) { // Nothing is required, mapped values will take the new global @@ -579,16 +580,19 @@ static bool LinkFunctionProtos(Module *Dest, const Module *Src, // 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 *SF = I; // SrcFunction Function *DF = 0; if (SF->hasName() && !SF->hasInternalLinkage()) { // Check to see if may have to link the function. - std::map::iterator EF = - GlobalsByName.find(SF->getName()); - if (EF != GlobalsByName.end()) - DF = dyn_cast(EF->second); + if (!(DF = Dest->getFunction(SF->getName(), SF->getFunctionType()))) { + std::map::iterator EF = + GlobalsByName.find(SF->getName()); + if (EF != GlobalsByName.end()) + DF = dyn_cast(EF->second); + if (DF && RecursiveResolveTypes(SF->getType(), DF->getType(), ST, "")) + DF = 0; // FIXME: gross. + } } if (!DF || SF->hasInternalLinkage() || DF->hasInternalLinkage()) { @@ -601,7 +605,7 @@ static bool LinkFunctionProtos(Module *Dest, const Module *Src, // visible symbol, DF must be an existing function with internal linkage. // Rename it. if (NewDF->getName() != SF->getName() && !NewDF->hasInternalLinkage()) - ForceRenaming(DF, SF->getName()); + ForceRenaming(NewDF, SF->getName()); // ... and remember this mapping... ValueMap.insert(std::make_pair(SF, NewDF)); @@ -634,7 +638,7 @@ static bool LinkFunctionProtos(Module *Dest, const Module *Src, } else if (SF->hasExternalLinkage()) { // The function is defined in both modules!! return Error(Err, "Function '" + - SF->getFunctionType()->getDescription() + "':\"" + + ToStr(SF->getFunctionType(), Src) + "':\"" + SF->getName() + "\" - Function is already defined!"); } else { assert(0 && "Unknown linkage configuration found!"); @@ -646,44 +650,23 @@ static bool LinkFunctionProtos(Module *Dest, const Module *Src, // 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, +static bool LinkFunctionBody(Function *Dest, Function *Src, std::map &GlobalMap, std::string *Err) { assert(Src && Dest && Dest->isExternal() && !Src->isExternal()); - std::map LocalMap; // Map for function local values - // Go through and convert function arguments over... + // Go through and convert function arguments over, remembering the mapping. Function::aiterator DI = Dest->abegin(); - for (Function::const_aiterator I = Src->abegin(), E = Src->aend(); + for (Function::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(I, DI)); + GlobalMap.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) { - // 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 - // instructions will still be referencing values in the Src module, not - // 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 = I->begin(), IE = I->end(); - II != IE; ++II) { - Instruction *DI = II->clone(); - DI->setName(II->getName()); - DBB->getInstList().push_back(DI); - LocalMap.insert(std::make_pair(II, DI)); - } - } + // Splice the body of the source function into the dest function. + Dest->getBasicBlockList().splice(Dest->end(), Src->getBasicBlockList()); // 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 @@ -694,7 +677,12 @@ static bool LinkFunctionBody(Function *Dest, const Function *Src, 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); + if (!isa(*OI) && !isa(*OI)) + *OI = RemapOperand(*OI, GlobalMap); + + // There is no need to map the arguments anymore. + for (Function::aiterator I = Src->abegin(), E = Src->aend(); I != E; ++I) + GlobalMap.erase(I); return false; } @@ -703,15 +691,13 @@ static bool LinkFunctionBody(Function *Dest, const Function *Src, // 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, +static bool LinkFunctionBodies(Module *Dest, Module *Src, std::map &ValueMap, std::string *Err) { // Loop over all of the functions in the src module, mapping them over as we // go - // - for (Module::const_iterator SF = Src->begin(), E = Src->end(); SF != E; ++SF){ + for (Module::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 @@ -728,7 +714,6 @@ static bool LinkFunctionBodies(Module *Dest, const Module *Src, // LinkAppendingVars - If there were any appending global variables, link them // together now. Return true on error. -// static bool LinkAppendingVars(Module *M, std::multimap &AppendingVars, std::string *ErrorMsg) { @@ -738,7 +723,6 @@ static bool LinkAppendingVars(Module *M, // same name, forming a new appending global variable with both of the // initializers merged together, then rewrite references to the old variables // and delete them. - // std::vector Inits; while (AppendingVars.size() > 1) { // Get the first two elements in the map... @@ -819,12 +803,17 @@ static bool LinkAppendingVars(Module *M, // error occurs, true is returned and ErrorMsg (if not null) is set to indicate // the problem. Upon failure, the Dest module could be in a modified state, and // shouldn't be relied on to be consistent. -// -bool llvm::LinkModules(Module *Dest, const Module *Src, std::string *ErrorMsg) { +bool +Linker::LinkModules(Module *Dest, Module *Src, std::string *ErrorMsg) { + assert(Dest != 0 && "Invalid Destination module"); + assert(Src != 0 && "Invalid Source Module"); + if (Dest->getEndianness() == Module::AnyEndianness) Dest->setEndianness(Src->getEndianness()); if (Dest->getPointerSize() == Module::AnyPointerSize) Dest->setPointerSize(Src->getPointerSize()); + if (Dest->getTargetTriple().empty()) + Dest->setTargetTriple(Src->getTargetTriple()); if (Src->getEndianness() != Module::AnyEndianness && Dest->getEndianness() != Src->getEndianness()) @@ -832,22 +821,32 @@ bool llvm::LinkModules(Module *Dest, const Module *Src, std::string *ErrorMsg) { if (Src->getPointerSize() != Module::AnyPointerSize && Dest->getPointerSize() != Src->getPointerSize()) std::cerr << "WARNING: Linking two modules of different pointer size!\n"; + if (!Src->getTargetTriple().empty() && + Dest->getTargetTriple() != Src->getTargetTriple()) + std::cerr << "WARNING: Linking two modules of different target triples!\n"; + + // Update the destination module's dependent libraries list with the libraries + // from the source module. There's no opportunity for duplicates here as the + // Module ensures that duplicate insertions are discarded. + Module::lib_iterator SI = Src->lib_begin(); + Module::lib_iterator SE = Src->lib_end(); + while ( SI != SE ) { + Dest->addLibrary(*SI); + ++SI; + } // 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. // Make sure there are no type name conflicts. - // if (LinkTypes(Dest, Src, ErrorMsg)) return true; // ValueMap - Mapping of values from what they used to be in Src, to what they // are now in Dest. - // std::map ValueMap; // AppendingVars - Keep track of global variables in the destination module // with appending linkage. After the module is linked together, they are // appended and the module is rewritten. - // std::multimap AppendingVars; // GlobalsByName - The LLVM SymbolTable class fights our best efforts at @@ -873,7 +872,6 @@ bool llvm::LinkModules(Module *Dest, const Module *Src, std::string *ErrorMsg) { // Insert all of the globals in src into the Dest module... without linking // initializers (which could refer to functions not yet mapped over). - // if (LinkGlobals(Dest, Src, ValueMap, AppendingVars, GlobalsByName, ErrorMsg)) return true; @@ -882,25 +880,28 @@ bool llvm::LinkModules(Module *Dest, const Module *Src, std::string *ErrorMsg) { // 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, GlobalsByName, 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 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; // If there were any appending global variables, link them together now. - // if (LinkAppendingVars(Dest, AppendingVars, ErrorMsg)) return true; + // If the source library's module id is in the dependent library list of the + // destination library, remove it since that module is now linked in. + sys::Path modId; + modId.setFile(Src->getModuleIdentifier()); + if (!modId.isEmpty()) + Dest->removeLibrary(modId.getBasename()); + return false; }