X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FLinker%2FLinkModules.cpp;h=afc06e4e47abeff49b6c815c7449a93799dfc553;hb=3d10a5a75794356a0a568ce283713adc3a963200;hp=27c71b16186f1b4cf34804e3a0d7fed64a59c0dc;hpb=a4477f9b31ce0b6fadc5365ff9355679c1ecb954;p=oota-llvm.git diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp index 27c71b16186..afc06e4e47a 100644 --- a/lib/Linker/LinkModules.cpp +++ b/lib/Linker/LinkModules.cpp @@ -19,12 +19,14 @@ #include "llvm/Linker.h" #include "llvm/Constants.h" #include "llvm/DerivedTypes.h" +#include "llvm/LLVMContext.h" #include "llvm/Module.h" #include "llvm/TypeSymbolTable.h" #include "llvm/ValueSymbolTable.h" #include "llvm/Instructions.h" #include "llvm/Assembly/Writer.h" #include "llvm/Support/Streams.h" +#include "llvm/Support/ErrorHandling.h" #include "llvm/System/Path.h" #include "llvm/ADT/DenseMap.h" #include @@ -37,14 +39,6 @@ static inline bool Error(std::string *E, const std::string &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() // // Description: @@ -83,14 +77,17 @@ namespace { class LinkerTypeMap : public AbstractTypeUser { typedef DenseMap TheMapTy; TheMapTy TheMap; + + LinkerTypeMap(const LinkerTypeMap&); // DO NOT IMPLEMENT + void operator=(const LinkerTypeMap&); // DO NOT IMPLEMENT public: - - LinkerTypeMap() { + LinkerTypeMap() {} + ~LinkerTypeMap() { for (DenseMap::iterator I = TheMap.begin(), E = TheMap.end(); I != E; ++I) I->first->removeAbstractTypeUser(this); } - + /// lookup - Return the value for the specified type or null if it doesn't /// exist. const Type *lookup(const Type *Ty) const { @@ -98,7 +95,7 @@ public: if (I != TheMap.end()) return I->second; return 0; } - + /// erase - Remove the specified type, returning true if it was in the set. bool erase(const Type *Ty) { if (!TheMap.erase(Ty)) @@ -107,17 +104,17 @@ public: Ty->removeAbstractTypeUser(this); return true; } - + /// insert - This returns true if the pointer was new to the set, false if it /// was already in the set. bool insert(const Type *Src, const Type *Dst) { - if (!TheMap.insert(std::make_pair(Src, PATypeHolder(Dst)))) + if (!TheMap.insert(std::make_pair(Src, PATypeHolder(Dst))).second) return false; // Already in map. if (Src->isAbstract()) Src->addAbstractTypeUser(this); return true; } - + protected: /// refineAbstractType - The callback method invoked when an abstract type is /// resolved to another type. An object must override this method to update @@ -127,7 +124,7 @@ protected: const Type *NewTy) { TheMapTy::iterator I = TheMap.find(OldTy); const Type *DstTy = I->second; - + TheMap.erase(I); if (OldTy->isAbstract()) OldTy->removeAbstractTypeUser(this); @@ -136,7 +133,7 @@ protected: if (NewTy->isAbstract()) insert(NewTy, DstTy); } - + /// The other case which AbstractTypeUsers must be aware of is when a type /// makes the transition from being abstract (where it has clients on it's /// AbstractTypeUsers list) to concrete (where it does not). This method @@ -145,7 +142,7 @@ protected: TheMap.erase(AbsTy); AbsTy->removeAbstractTypeUser(this); } - + // for debugging... virtual void dump() const { cerr << "AbstractTypeSet!\n"; @@ -172,7 +169,7 @@ static bool RecursiveResolveTypesI(const Type *DstTy, const Type *SrcTy, // If neither type is abstract, then they really are just different types. if (!DstTy->isAbstract() && !SrcTy->isAbstract()) return true; - + // Otherwise, resolve the used type used by this derived type... switch (DstTy->getTypeID()) { default: @@ -183,7 +180,7 @@ static bool RecursiveResolveTypesI(const Type *DstTy, const Type *SrcTy, if (DstFT->isVarArg() != SrcFT->isVarArg() || DstFT->getNumContainedTypes() != SrcFT->getNumContainedTypes()) return true; - + // Use TypeHolder's so recursive resolution won't break us. PATypeHolder ST(SrcFT), DT(DstFT); for (unsigned i = 0, e = DstFT->getNumContainedTypes(); i != e; ++i) { @@ -198,7 +195,7 @@ static bool RecursiveResolveTypesI(const Type *DstTy, const Type *SrcTy, const StructType *SrcST = cast(SrcTy); if (DstST->getNumContainedTypes() != SrcST->getNumContainedTypes()) return true; - + PATypeHolder ST(SrcST), DT(DstST); for (unsigned i = 0, e = DstST->getNumContainedTypes(); i != e; ++i) { const Type *SE = ST->getContainedType(i), *DE = DT->getContainedType(i); @@ -224,10 +221,10 @@ static bool RecursiveResolveTypesI(const Type *DstTy, const Type *SrcTy, case Type::PointerTyID: { const PointerType *DstPT = cast(DstTy); const PointerType *SrcPT = cast(SrcTy); - + if (DstPT->getAddressSpace() != SrcPT->getAddressSpace()) return true; - + // If this is a pointer type, check to see if we have already seen it. If // 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 @@ -235,7 +232,7 @@ static bool RecursiveResolveTypesI(const Type *DstTy, const Type *SrcTy, if (SrcPT->isAbstract()) if (const Type *ExistingDestTy = Pointers.lookup(SrcPT)) return ExistingDestTy != DstPT; - + if (DstPT->isAbstract()) if (const Type *ExistingSrcTy = Pointers.lookup(DstPT)) return ExistingSrcTy != SrcPT; @@ -245,7 +242,7 @@ static bool RecursiveResolveTypesI(const Type *DstTy, const Type *SrcTy, Pointers.insert(DstPT, SrcPT); if (SrcPT->isAbstract()) Pointers.insert(SrcPT, DstPT); - + return RecursiveResolveTypesI(DstPT->getElementType(), SrcPT->getElementType(), Pointers); } @@ -337,6 +334,7 @@ static bool LinkTypes(Module *Dest, const Module *Src, std::string *Err) { return false; } +#ifndef NDEBUG static void PrintMap(const std::map &M) { for (std::map::const_iterator I = M.begin(), E =M.end(); I != E; ++I) { @@ -347,13 +345,15 @@ static void PrintMap(const std::map &M) { cerr << "\n"; } } +#endif // RemapOperand - Use ValueMap to convert constants from one module to another. static Value *RemapOperand(const Value *In, - std::map &ValueMap) { + std::map &ValueMap, + LLVMContext &Context) { std::map::const_iterator I = ValueMap.find(In); - if (I != ValueMap.end()) + if (I != ValueMap.end()) return I->second; // Check to see if it's a constant that we are interested in transforming. @@ -366,46 +366,52 @@ static Value *RemapOperand(const Value *In, 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), ValueMap)); - Result = ConstantArray::get(cast(CPA->getType()), Operands); + Operands[i] =cast(RemapOperand(CPA->getOperand(i), ValueMap, + Context)); + Result = + Context.getConstantArray(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), ValueMap)); - Result = ConstantStruct::get(cast(CPS->getType()), Operands); + Operands[i] =cast(RemapOperand(CPS->getOperand(i), ValueMap, + Context)); + Result = + Context.getConstantStruct(cast(CPS->getType()), Operands); } else if (isa(CPV) || isa(CPV)) { Result = const_cast(CPV); } else if (const ConstantVector *CP = dyn_cast(CPV)) { std::vector Operands(CP->getNumOperands()); for (unsigned i = 0, e = CP->getNumOperands(); i != e; ++i) - Operands[i] = cast(RemapOperand(CP->getOperand(i), ValueMap)); - Result = ConstantVector::get(Operands); + Operands[i] = cast(RemapOperand(CP->getOperand(i), ValueMap, + Context)); + Result = Context.getConstantVector(Operands); } else if (const ConstantExpr *CE = dyn_cast(CPV)) { std::vector Ops; for (unsigned i = 0, e = CE->getNumOperands(); i != e; ++i) - Ops.push_back(cast(RemapOperand(CE->getOperand(i),ValueMap))); + Ops.push_back(cast(RemapOperand(CE->getOperand(i),ValueMap, + Context))); Result = CE->getWithOperands(Ops); - } else if (isa(CPV)) { - assert(0 && "Unmapped global?"); } else { - assert(0 && "Unknown type of derived type constant value!"); + assert(!isa(CPV) && "Unmapped global?"); + llvm_unreachable("Unknown type of derived type constant value!"); } } else if (isa(In)) { Result = const_cast(In); } - + // Cache the mapping in our local map structure if (Result) { ValueMap[In] = Result; return Result; } - +#ifndef NDEBUG cerr << "LinkModules ValueMap: \n"; PrintMap(ValueMap); cerr << "Couldn't remap value: " << (void*)In << " " << *In << "\n"; - assert(0 && "Couldn't remap value!"); + llvm_unreachable("Couldn't remap value!"); +#endif return 0; } @@ -418,7 +424,7 @@ static void ForceRenaming(GlobalValue *GV, const std::string &Name) { // If there is a conflict, rename the conflict. if (GlobalValue *ConflictGV = cast_or_null(ST.lookup(Name))) { - assert(ConflictGV->hasInternalLinkage() && + assert(ConflictGV->hasLocalLinkage() && "Not conflicting with a static global, should link instead!"); GV->takeName(ConflictGV); ConflictGV->setName(Name); // This will cause ConflictGV to get renamed @@ -429,7 +435,7 @@ static void ForceRenaming(GlobalValue *GV, const std::string &Name) { } /// CopyGVAttributes - copy additional attributes (those not needed to construct -/// a GlobalValue) from the SrcGV to the DestGV. +/// a GlobalValue) from the SrcGV to the DestGV. static void CopyGVAttributes(GlobalValue *DestGV, const GlobalValue *SrcGV) { // Use the maximum alignment, rather than just copying the alignment of SrcGV. unsigned Alignment = std::max(DestGV->getAlignment(), SrcGV->getAlignment()); @@ -447,7 +453,7 @@ static void CopyGVAttributes(GlobalValue *DestGV, const GlobalValue *SrcGV) { static bool GetLinkageResult(GlobalValue *Dest, const GlobalValue *Src, GlobalValue::LinkageTypes <, bool &LinkFromSrc, std::string *Err) { - assert((!Dest || !Src->hasInternalLinkage()) && + assert((!Dest || !Src->hasLocalLinkage()) && "If Src has internal linkage, Dest shouldn't be set!"); if (!Dest) { // Linking something to nothing. @@ -461,9 +467,9 @@ static bool GetLinkageResult(GlobalValue *Dest, const GlobalValue *Src, if (Dest->isDeclaration()) { LinkFromSrc = true; LT = Src->getLinkage(); - } + } } else if (Dest->hasExternalWeakLinkage()) { - //If the Dest is weak, use the source linkage + // If the Dest is weak, use the source linkage. LinkFromSrc = true; LT = Src->getLinkage(); } else { @@ -480,21 +486,20 @@ static bool GetLinkageResult(GlobalValue *Dest, const GlobalValue *Src, "': can only link appending global with another appending global!"); LinkFromSrc = true; // Special cased. LT = Src->getLinkage(); - } else if (Src->hasWeakLinkage() || Src->hasLinkOnceLinkage() || - Src->hasCommonLinkage()) { + } else if (Src->isWeakForLinker()) { // At this point we know that Dest has LinkOnce, External*, Weak, Common, // or DLL* linkage. - if ((Dest->hasLinkOnceLinkage() && - (Src->hasWeakLinkage() || Src->hasCommonLinkage())) || - Dest->hasExternalWeakLinkage()) { + if (Dest->hasExternalWeakLinkage() || + Dest->hasAvailableExternallyLinkage() || + (Dest->hasLinkOnceLinkage() && + (Src->hasWeakLinkage() || Src->hasCommonLinkage()))) { LinkFromSrc = true; LT = Src->getLinkage(); } else { LinkFromSrc = false; LT = Dest->getLinkage(); } - } else if (Dest->hasWeakLinkage() || Dest->hasLinkOnceLinkage() || - Dest->hasCommonLinkage()) { + } else if (Dest->isWeakForLinker()) { // At this point we know that Src has External* or DLL* linkage. if (Src->hasExternalWeakLinkage()) { LinkFromSrc = false; @@ -531,31 +536,30 @@ static bool LinkGlobals(Module *Dest, const Module *Src, std::map &ValueMap, std::multimap &AppendingVars, std::string *Err) { + ValueSymbolTable &DestSymTab = Dest->getValueSymbolTable(); + LLVMContext &Context = Dest->getContext(); + // Loop over all of the globals in the src module, mapping them over as we go - for (Module::const_global_iterator I = Src->global_begin(), E = Src->global_end(); - I != E; ++I) { + for (Module::const_global_iterator I = Src->global_begin(), + E = Src->global_end(); I != E; ++I) { const GlobalVariable *SGV = I; GlobalValue *DGV = 0; - // Check to see if may have to link the global with the global - if (SGV->hasName() && !SGV->hasInternalLinkage()) { - DGV = Dest->getGlobalVariable(SGV->getName()); - if (DGV && DGV->getType() != SGV->getType()) - // If types don't agree due to opaque types, try to resolve them. - RecursiveResolveTypes(SGV->getType(), DGV->getType()); - } - - // Check to see if may have to link the global with the alias - if (!DGV && SGV->hasName() && !SGV->hasInternalLinkage()) { - DGV = Dest->getNamedAlias(SGV->getName()); - if (DGV && DGV->getType() != SGV->getType()) - // If types don't agree due to opaque types, try to resolve them. - RecursiveResolveTypes(SGV->getType(), DGV->getType()); - } + // Check to see if may have to link the global with the global, alias or + // function. + if (SGV->hasName() && !SGV->hasLocalLinkage()) + DGV = cast_or_null(DestSymTab.lookup(SGV->getNameStart(), + SGV->getNameEnd())); - if (DGV && DGV->hasInternalLinkage()) + // 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->hasLocalLinkage()) DGV = 0; + // If types don't agree due to opaque types, try to resolve them. + if (DGV && DGV->getType() != SGV->getType()) + RecursiveResolveTypes(SGV->getType(), DGV->getType()); + assert((SGV->hasInitializer() || SGV->hasExternalWeakLinkage() || SGV->hasExternalLinkage() || SGV->hasDLLImportLinkage()) && "Global must either be external or have an initializer!"); @@ -565,38 +569,48 @@ static bool LinkGlobals(Module *Dest, const Module *Src, if (GetLinkageResult(DGV, SGV, NewLinkage, LinkFromSrc, Err)) return true; - if (!DGV) { + if (DGV == 0) { // 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... + // later by LinkGlobalInits. GlobalVariable *NewDGV = - new GlobalVariable(SGV->getType()->getElementType(), + new GlobalVariable(*Dest, SGV->getType()->getElementType(), SGV->isConstant(), SGV->getLinkage(), /*init*/0, - SGV->getName(), Dest); + SGV->getName(), 0, false, + SGV->getType()->getAddressSpace()); // Propagate alignment, visibility and section info. CopyGVAttributes(NewDGV, SGV); // 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()) + if (!NewDGV->hasLocalLinkage() && NewDGV->getName() != SGV->getName()) ForceRenaming(NewDGV, SGV->getName()); - // Make sure to remember this mapping... + // Make sure to remember this mapping. ValueMap[SGV] = NewDGV; + // Keep track that this is an appending variable. if (SGV->hasAppendingLinkage()) - // Keep track that this is an appending variable... AppendingVars.insert(std::make_pair(SGV->getName(), NewDGV)); - } else if (DGV->hasAppendingLinkage()) { + continue; + } + + // If the visibilities of the symbols disagree and the destination is a + // prototype, take the visibility of its input. + if (DGV->isDeclaration()) + DGV->setVisibility(SGV->getVisibility()); + + 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 // performed. GlobalVariable *NewDGV = - new GlobalVariable(SGV->getType()->getElementType(), + new GlobalVariable(*Dest, SGV->getType()->getElementType(), SGV->isConstant(), SGV->getLinkage(), /*init*/0, - "", Dest); + "", 0, false, + SGV->getType()->getAddressSpace()); // Set alignment allowing CopyGVAttributes merge it with alignment of SGV. NewDGV->setAlignment(DGV->getAlignment()); @@ -608,79 +622,100 @@ 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 if (GlobalAlias *DGA = dyn_cast(DGV)) { - // SGV is global, but DGV is alias. The only valid mapping is when SGV is - // external declaration, which is effectively a no-op. Also make sure - // linkage calculation was correct. - if (SGV->isDeclaration() && !LinkFromSrc) { - // Make sure to remember this mapping... - ValueMap[SGV] = DGA; - } else + continue; + } + + if (LinkFromSrc) { + if (isa(DGV)) return Error(Err, "Global-Alias Collision on '" + SGV->getName() + "': symbol multiple defined"); - } else if (GlobalVariable *DGVar = dyn_cast(DGV)) { - // Otherwise, perform the global-global mapping as instructed by - // GetLinkageResult. - if (LinkFromSrc) { - // Propagate alignment, section, and visibility info. - CopyGVAttributes(DGVar, SGV); - - // 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() != DGVar->getType()) { - GlobalVariable *NewDGV = - new GlobalVariable(SGV->getType()->getElementType(), - DGVar->isConstant(), DGVar->getLinkage(), - /*init*/0, DGVar->getName(), Dest); - CopyGVAttributes(NewDGV, DGVar); - DGV->replaceAllUsesWith(ConstantExpr::getBitCast(NewDGV, - DGVar->getType())); - // DGVar will conflict with NewDGV because they both had the same - // name. We must erase this now so ForceRenaming doesn't assert - // because DGV might not have internal linkage. - DGVar->eraseFromParent(); - - // If the symbol table 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()) - ForceRenaming(NewDGV, SGV->getName()); - - DGVar = NewDGV; - } - // Inherit const as appropriate - DGVar->setConstant(SGV->isConstant()); + // 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. Note that the thing + // we are replacing may be a function (if a prototype, weak, etc) or a + // global variable. + GlobalVariable *NewDGV = + new GlobalVariable(*Dest, SGV->getType()->getElementType(), + SGV->isConstant(), NewLinkage, /*init*/0, + DGV->getName(), 0, false, + SGV->getType()->getAddressSpace()); - // Set initializer to zero, so we can link the stuff later - DGVar->setInitializer(0); - } else { - // Special case for const propagation - if (DGVar->isDeclaration() && SGV->isConstant() && !DGVar->isConstant()) - DGVar->setConstant(true); - } + // Propagate alignment, section, and visibility info. + CopyGVAttributes(NewDGV, SGV); + DGV->replaceAllUsesWith(Context.getConstantExprBitCast(NewDGV, + DGV->getType())); + + // DGV will conflict with NewDGV because they both had the same + // name. We must erase this now so ForceRenaming doesn't assert + // because DGV might not have internal linkage. + if (GlobalVariable *Var = dyn_cast(DGV)) + Var->eraseFromParent(); + else + cast(DGV)->eraseFromParent(); + DGV = NewDGV; + + // If the symbol table renamed the global, but it is an externally visible + // symbol, DGV must be an existing global with internal linkage. Rename. + if (NewDGV->getName() != SGV->getName() && !NewDGV->hasLocalLinkage()) + ForceRenaming(NewDGV, SGV->getName()); - // Set calculated linkage - DGVar->setLinkage(NewLinkage); + // Inherit const as appropriate. + NewDGV->setConstant(SGV->isConstant()); - // Make sure to remember this mapping... - ValueMap[SGV] = ConstantExpr::getBitCast(DGVar, SGV->getType()); + // Make sure to remember this mapping. + ValueMap[SGV] = NewDGV; + continue; } + + // Not "link from source", keep the one in the DestModule and remap the + // input onto it. + + // Special case for const propagation. + if (GlobalVariable *DGVar = dyn_cast(DGV)) + if (DGVar->isDeclaration() && SGV->isConstant() && !DGVar->isConstant()) + DGVar->setConstant(true); + + // SGV is global, but DGV is alias. + if (isa(DGV)) { + // The only valid mappings are: + // - SGV is external declaration, which is effectively a no-op. + // - SGV is weak, when we just need to throw SGV out. + if (!SGV->isDeclaration() && !SGV->isWeakForLinker()) + return Error(Err, "Global-Alias Collision on '" + SGV->getName() + + "': symbol multiple defined"); + } + + // Set calculated linkage + DGV->setLinkage(NewLinkage); + + // Make sure to remember this mapping... + ValueMap[SGV] = Context.getConstantExprBitCast(DGV, SGV->getType()); } return false; } static GlobalValue::LinkageTypes CalculateAliasLinkage(const GlobalValue *SGV, const GlobalValue *DGV) { - if (SGV->hasExternalLinkage() || DGV->hasExternalLinkage()) + GlobalValue::LinkageTypes SL = SGV->getLinkage(); + GlobalValue::LinkageTypes DL = DGV->getLinkage(); + if (SL == GlobalValue::ExternalLinkage || DL == GlobalValue::ExternalLinkage) return GlobalValue::ExternalLinkage; - else if (SGV->hasWeakLinkage() || DGV->hasWeakLinkage()) - return GlobalValue::WeakLinkage; - else { - assert(SGV->hasInternalLinkage() && DGV->hasInternalLinkage() && - "Unexpected linkage type"); + else if (SL == GlobalValue::WeakAnyLinkage || + DL == GlobalValue::WeakAnyLinkage) + return GlobalValue::WeakAnyLinkage; + else if (SL == GlobalValue::WeakODRLinkage || + DL == GlobalValue::WeakODRLinkage) + return GlobalValue::WeakODRLinkage; + else if (SL == GlobalValue::InternalLinkage && + DL == GlobalValue::InternalLinkage) return GlobalValue::InternalLinkage; + else if (SL == GlobalValue::LinkerPrivateLinkage && + DL == GlobalValue::LinkerPrivateLinkage) + return GlobalValue::LinkerPrivateLinkage; + else { + assert (SL == GlobalValue::PrivateLinkage && + DL == GlobalValue::PrivateLinkage && "Unexpected linkage type"); + return GlobalValue::PrivateLinkage; } } @@ -690,6 +725,8 @@ CalculateAliasLinkage(const GlobalValue *SGV, const GlobalValue *DGV) { static bool LinkAlias(Module *Dest, const Module *Src, std::map &ValueMap, std::string *Err) { + LLVMContext &Context = Dest->getContext(); + // Loop over all alias in the src module for (Module::const_alias_iterator I = Src->alias_begin(), E = Src->alias_end(); I != E; ++I) { @@ -705,38 +742,32 @@ static bool LinkAlias(Module *Dest, const Module *Src, GlobalValue* DGV = NULL; // Try to find something 'similar' to SGA in destination module. - if (!DGV && !SGA->hasInternalLinkage()) { + if (!DGV && !SGA->hasLocalLinkage()) { DGV = Dest->getNamedAlias(SGA->getName()); // If types don't agree due to opaque types, try to resolve them. if (DGV && DGV->getType() != SGA->getType()) - if (RecursiveResolveTypes(SGA->getType(), DGV->getType())) - return Error(Err, "Alias Collision on '" + SGA->getName()+ - "': aliases have different types"); + RecursiveResolveTypes(SGA->getType(), DGV->getType()); } - if (!DGV && !SGA->hasInternalLinkage()) { + if (!DGV && !SGA->hasLocalLinkage()) { DGV = Dest->getGlobalVariable(SGA->getName()); // If types don't agree due to opaque types, try to resolve them. if (DGV && DGV->getType() != SGA->getType()) - if (RecursiveResolveTypes(SGA->getType(), DGV->getType())) - return Error(Err, "Alias Collision on '" + SGA->getName()+ - "': aliases have different types"); + RecursiveResolveTypes(SGA->getType(), DGV->getType()); } - if (!DGV && !SGA->hasInternalLinkage()) { + if (!DGV && !SGA->hasLocalLinkage()) { DGV = Dest->getFunction(SGA->getName()); // If types don't agree due to opaque types, try to resolve them. if (DGV && DGV->getType() != SGA->getType()) - if (RecursiveResolveTypes(SGA->getType(), DGV->getType())) - return Error(Err, "Alias Collision on '" + SGA->getName()+ - "': aliases have different types"); + RecursiveResolveTypes(SGA->getType(), DGV->getType()); } // No linking to be performed on internal stuff. - if (DGV && DGV->hasInternalLinkage()) + if (DGV && DGV->hasLocalLinkage()) DGV = NULL; if (GlobalAlias *DGA = dyn_cast_or_null(DGV)) { @@ -754,8 +785,9 @@ static bool LinkAlias(Module *Dest, const Module *Src, return Error(Err, "Alias Collision on '" + SGA->getName()+ "': aliases have different aliasees"); } else if (GlobalVariable *DGVar = dyn_cast_or_null(DGV)) { - // The only allowed way is to link alias with external declaration. - if (DGVar->isDeclaration()) { + // The only allowed way is to link alias with external declaration or weak + // symbol.. + if (DGVar->isDeclaration() || DGVar->isWeakForLinker()) { // But only if aliasee is global too... if (!isa(DAliasee)) return Error(Err, "Global-Alias Collision on '" + SGA->getName() + @@ -767,7 +799,7 @@ static bool LinkAlias(Module *Dest, const Module *Src, // Any uses of DGV need to change to NewGA, with cast, if needed. if (SGA->getType() != DGVar->getType()) - DGVar->replaceAllUsesWith(ConstantExpr::getBitCast(NewGA, + DGVar->replaceAllUsesWith(Context.getConstantExprBitCast(NewGA, DGVar->getType())); else DGVar->replaceAllUsesWith(NewGA); @@ -782,8 +814,9 @@ static bool LinkAlias(Module *Dest, const Module *Src, return Error(Err, "Global-Alias Collision on '" + SGA->getName() + "': symbol multiple defined"); } else if (Function *DF = dyn_cast_or_null(DGV)) { - // The only allowed way is to link alias with external declaration. - if (DF->isDeclaration()) { + // The only allowed way is to link alias with external declaration or weak + // symbol... + if (DF->isDeclaration() || DF->isWeakForLinker()) { // But only if aliasee is function too... if (!isa(DAliasee)) return Error(Err, "Function-Alias Collision on '" + SGA->getName() + @@ -795,7 +828,7 @@ static bool LinkAlias(Module *Dest, const Module *Src, // Any uses of DF need to change to NewGA, with cast, if needed. if (SGA->getType() != DF->getType()) - DF->replaceAllUsesWith(ConstantExpr::getBitCast(NewGA, + DF->replaceAllUsesWith(Context.getConstantExprBitCast(NewGA, DF->getType())); else DF->replaceAllUsesWith(NewGA); @@ -825,7 +858,7 @@ static bool LinkAlias(Module *Dest, const Module *Src, // If the symbol table renamed the alias, but it is an externally visible // symbol, DGA must be an global value with internal linkage. Rename it. if (NewGA->getName() != SGA->getName() && - !NewGA->hasInternalLinkage()) + !NewGA->hasLocalLinkage()) ForceRenaming(NewGA, SGA->getName()); // Remember this mapping so uses in the source module get remapped @@ -842,7 +875,6 @@ static bool LinkAlias(Module *Dest, const Module *Src, 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_global_iterator I = Src->global_begin(), E = Src->global_end(); I != E; ++I) { @@ -851,31 +883,41 @@ static bool LinkGlobalInits(Module *Dest, const Module *Src, 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)); - - GlobalVariable *DGV = - cast(ValueMap[SGV]->stripPointerCasts()); - if (DGV->hasInitializer()) { - if (SGV->hasExternalLinkage()) { - if (DGV->getInitializer() != SInit) - return Error(Err, "Global Variable Collision on '" + SGV->getName() + - "': global variables have different initializers"); - } else if (DGV->hasLinkOnceLinkage() || DGV->hasWeakLinkage() || - DGV->hasCommonLinkage()) { - // Nothing is required, mapped values will take the new global - // automatically. - } else if (SGV->hasLinkOnceLinkage() || SGV->hasWeakLinkage() || - SGV->hasCommonLinkage()) { - // Nothing is required, mapped values will take the new global - // automatically. - } else if (DGV->hasAppendingLinkage()) { - assert(0 && "Appending linkage unimplemented!"); + cast(RemapOperand(SGV->getInitializer(), ValueMap, + Dest->getContext())); + // Grab destination global variable or alias. + GlobalValue *DGV = cast(ValueMap[SGV]->stripPointerCasts()); + + // If dest if global variable, check that initializers match. + if (GlobalVariable *DGVar = dyn_cast(DGV)) { + if (DGVar->hasInitializer()) { + if (SGV->hasExternalLinkage()) { + if (DGVar->getInitializer() != SInit) + return Error(Err, "Global Variable Collision on '" + + SGV->getName() + + "': global variables have different initializers"); + } else if (DGVar->isWeakForLinker()) { + // Nothing is required, mapped values will take the new global + // automatically. + } else if (SGV->isWeakForLinker()) { + // Nothing is required, mapped values will take the new global + // automatically. + } else if (DGVar->hasAppendingLinkage()) { + llvm_unreachable("Appending linkage unimplemented!"); + } else { + llvm_unreachable("Unknown linkage!"); + } } else { - assert(0 && "Unknown linkage!"); + // Copy the initializer over now... + DGVar->setInitializer(SInit); } } else { - // Copy the initializer over now... - DGV->setInitializer(SInit); + // Destination is alias, the only valid situation is when source is + // weak. Also, note, that we already checked linkage in LinkGlobals(), + // thus we assert here. + // FIXME: Should we weaken this assumption, 'dereference' alias and + // check for initializer of aliasee? + assert(SGV->isWeakForLinker()); } } } @@ -889,163 +931,113 @@ static bool LinkGlobalInits(Module *Dest, const Module *Src, static bool LinkFunctionProtos(Module *Dest, const Module *Src, std::map &ValueMap, std::string *Err) { + ValueSymbolTable &DestSymTab = Dest->getValueSymbolTable(); + LLVMContext &Context = Dest->getContext(); + // Loop over all of the functions in the src module, mapping them over for (Module::const_iterator I = Src->begin(), E = Src->end(); I != E; ++I) { const Function *SF = I; // SrcFunction - - Function *DF = 0; - - // If this function is internal or has no name, it doesn't participate in - // linkage. - if (SF->hasName() && !SF->hasInternalLinkage()) { - // Check to see if may have to link the function. - DF = Dest->getFunction(SF->getName()); - if (DF && DF->hasInternalLinkage()) - DF = 0; - } - + GlobalValue *DGV = 0; + + // Check to see if may have to link the function with the global, alias or + // function. + if (SF->hasName() && !SF->hasLocalLinkage()) + DGV = cast_or_null(DestSymTab.lookup(SF->getNameStart(), + 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->hasLocalLinkage()) + DGV = 0; + + // If types don't agree due to opaque types, try to resolve them. + if (DGV && DGV->getType() != SF->getType()) + RecursiveResolveTypes(SF->getType(), DGV->getType()); + + GlobalValue::LinkageTypes NewLinkage = GlobalValue::InternalLinkage; + bool LinkFromSrc = false; + if (GetLinkageResult(DGV, SF, NewLinkage, LinkFromSrc, Err)) + return true; + // If there is no linkage to be performed, just bring over SF without // modifying it. - if (DF == 0) { + if (DGV == 0) { // Function does not already exist, simply insert an function signature // identical to SF into the dest module. Function *NewDF = Function::Create(SF->getFunctionType(), SF->getLinkage(), SF->getName(), Dest); CopyGVAttributes(NewDF, SF); - + // 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->hasInternalLinkage() && NewDF->getName() != SF->getName()) + if (!NewDF->hasLocalLinkage() && NewDF->getName() != SF->getName()) ForceRenaming(NewDF, SF->getName()); - + // ... and remember this mapping... ValueMap[SF] = NewDF; continue; } - - - // If types don't agree because of opaque, try to resolve them. - if (SF->getType() != DF->getType()) - RecursiveResolveTypes(SF->getType(), DF->getType()); - - // Check visibility, merging if a definition overrides a prototype. - if (SF->getVisibility() != DF->getVisibility()) { - // If one is a prototype, ignore its visibility. Prototypes are always - // overridden by the definition. - if (!SF->isDeclaration() && !DF->isDeclaration()) - return Error(Err, "Linking functions named '" + SF->getName() + - "': symbols have different visibilities!"); - - // Otherwise, replace the visibility of DF if DF is a prototype. - if (DF->isDeclaration()) - DF->setVisibility(SF->getVisibility()); - } - - if (DF->getType() != SF->getType()) { - if (DF->isDeclaration() && !SF->isDeclaration()) { - // We have a definition of the same name but different type in the - // source module. Copy the prototype to the destination and replace - // uses of the destination's prototype with the new prototype. - Function *NewDF = Function::Create(SF->getFunctionType(), - SF->getLinkage(), - SF->getName(), Dest); - CopyGVAttributes(NewDF, SF); - - // Any uses of DF need to change to NewDF, with cast - DF->replaceAllUsesWith(ConstantExpr::getBitCast(NewDF, DF->getType())); - - // DF will conflict with NewDF because they both had the same. We must - // erase this now so ForceRenaming doesn't assert because DF might - // not have internal linkage. - DF->eraseFromParent(); - // If the symbol table 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()) - ForceRenaming(NewDF, SF->getName()); - - // Remember this mapping so uses in the source module get remapped - // later by RemapOperand. - ValueMap[SF] = NewDF; - } else if (SF->isDeclaration()) { - // We have two functions of the same name but different type and the - // source is a declaration while the destination is not. Any use of - // the source must be mapped to the destination, with a cast. - ValueMap[SF] = ConstantExpr::getBitCast(DF, SF->getType()); - } else { - // We have two functions of the same name but different types and they - // are both definitions. This is an error. - return Error(Err, "Function '" + DF->getName() + "' defined as both '" + - ToStr(SF->getFunctionType(), Src) + "' and '" + - ToStr(DF->getFunctionType(), Dest) + "'"); - } - continue; - } - - if (SF->isDeclaration()) { - // If SF is a declaration or if both SF & DF are declarations, just link - // the declarations, we aren't adding anything. - if (SF->hasDLLImportLinkage()) { - if (DF->isDeclaration()) { - ValueMap[SF] = DF; - DF->setLinkage(SF->getLinkage()); - } - } else { - ValueMap[SF] = DF; - } - continue; - } - - // If DF is external but SF is not, link the external functions, update - // linkage qualifiers. - if (DF->isDeclaration() && !DF->hasDLLImportLinkage()) { - ValueMap.insert(std::make_pair(SF, DF)); - DF->setLinkage(SF->getLinkage()); - continue; - } - - // At this point we know that DF has LinkOnce, Weak, or External* linkage. - if (SF->hasWeakLinkage() || SF->hasLinkOnceLinkage() || - SF->hasCommonLinkage()) { - ValueMap[SF] = DF; - - // Linkonce+Weak = Weak - // *+External Weak = * - if ((DF->hasLinkOnceLinkage() && - (SF->hasWeakLinkage() || SF->hasCommonLinkage())) || - DF->hasExternalWeakLinkage()) - DF->setLinkage(SF->getLinkage()); + // If the visibilities of the symbols disagree and the destination is a + // prototype, take the visibility of its input. + if (DGV->isDeclaration()) + DGV->setVisibility(SF->getVisibility()); + + if (LinkFromSrc) { + if (isa(DGV)) + return Error(Err, "Function-Alias Collision on '" + SF->getName() + + "': symbol multiple defined"); + + // We have a definition of the same name but different type in the + // source module. Copy the prototype to the destination and replace + // uses of the destination's prototype with the new prototype. + Function *NewDF = Function::Create(SF->getFunctionType(), NewLinkage, + SF->getName(), Dest); + CopyGVAttributes(NewDF, SF); + + // Any uses of DF need to change to NewDF, with cast + DGV->replaceAllUsesWith(Context.getConstantExprBitCast(NewDF, + DGV->getType())); + + // DF will conflict with NewDF because they both had the same. We must + // erase this now so ForceRenaming doesn't assert because DF might + // not have internal linkage. + if (GlobalVariable *Var = dyn_cast(DGV)) + Var->eraseFromParent(); + else + cast(DGV)->eraseFromParent(); + + // If the symbol table 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->hasLocalLinkage()) + ForceRenaming(NewDF, SF->getName()); + + // Remember this mapping so uses in the source module get remapped + // later by RemapOperand. + ValueMap[SF] = NewDF; continue; } - - if (DF->hasWeakLinkage() || DF->hasLinkOnceLinkage() || - DF->hasCommonLinkage()) { - // At this point we know that SF has LinkOnce or External* linkage. - ValueMap[SF] = DF; - - // If the source function has stronger linkage than the destination, - // its body and linkage should override ours. - if (!SF->hasLinkOnceLinkage() && !SF->hasExternalWeakLinkage()) { - // Don't inherit linkonce & external weak linkage. - DF->setLinkage(SF->getLinkage()); - DF->deleteBody(); - } - continue; + + // Not "link from source", keep the one in the DestModule and remap the + // input onto it. + + if (isa(DGV)) { + // The only valid mappings are: + // - SF is external declaration, which is effectively a no-op. + // - SF is weak, when we just need to throw SF out. + if (!SF->isDeclaration() && !SF->isWeakForLinker()) + return Error(Err, "Function-Alias Collision on '" + SF->getName() + + "': symbol multiple defined"); } - - if (SF->getLinkage() != DF->getLinkage()) - return Error(Err, "Functions named '" + SF->getName() + - "' have different linkage specifiers!"); - - // The function is defined identically in both modules! - if (SF->hasExternalLinkage()) - return Error(Err, "Function '" + - ToStr(SF->getFunctionType(), Src) + "':\"" + - SF->getName() + "\" - Function is already defined!"); - assert(0 && "Unknown linkage configuration found!"); + + // Set calculated linkage + DGV->setLinkage(NewLinkage); + + // Make sure to remember this mapping. + ValueMap[SF] = Context.getConstantExprBitCast(DGV, SF->getType()); } return false; } @@ -1081,7 +1073,7 @@ static bool LinkFunctionBody(Function *Dest, Function *Src, for (Instruction::op_iterator OI = I->op_begin(), OE = I->op_end(); OI != OE; ++OI) if (!isa(*OI) && !isa(*OI)) - *OI = RemapOperand(*OI, ValueMap); + *OI = RemapOperand(*OI, ValueMap, *Dest->getContext()); // There is no need to map the arguments anymore. for (Function::arg_iterator I = Src->arg_begin(), E = Src->arg_end(); @@ -1103,10 +1095,10 @@ static bool LinkFunctionBodies(Module *Dest, Module *Src, // go for (Module::iterator SF = Src->begin(), E = Src->end(); SF != E; ++SF) { if (!SF->isDeclaration()) { // No body if function is external - Function *DF = cast(ValueMap[SF]); // Destination function + Function *DF = dyn_cast(ValueMap[SF]); // Destination function // DF not external SF external? - if (DF->isDeclaration()) + if (DF && DF->isDeclaration()) // Only provide the function body if there isn't one already. if (LinkFunctionBody(DF, SF, ValueMap, Err)) return true; @@ -1122,6 +1114,8 @@ static bool LinkAppendingVars(Module *M, std::string *ErrorMsg) { if (AppendingVars.empty()) return false; // Nothing to do. + LLVMContext &Context = M->getContext(); + // Loop over the multimap of appending vars, processing any variables with the // same name, forming a new appending global variable with both of the // initializers merged together, then rewrite references to the old variables @@ -1158,16 +1152,18 @@ static bool LinkAppendingVars(Module *M, if (G1->getSection() != G2->getSection()) return Error(ErrorMsg, "Appending variables with different section name need to be linked!"); - + unsigned NewSize = T1->getNumElements() + T2->getNumElements(); - ArrayType *NewType = ArrayType::get(T1->getElementType(), NewSize); + ArrayType *NewType = Context.getArrayType(T1->getElementType(), + NewSize); G1->setName(""); // Clear G1's name in case of a conflict! - + // Create the new global variable... GlobalVariable *NG = - new GlobalVariable(NewType, G1->isConstant(), G1->getLinkage(), - /*init*/0, First->first, M, G1->isThreadLocal()); + new GlobalVariable(*M, NewType, G1->isConstant(), G1->getLinkage(), + /*init*/0, First->first, 0, G1->isThreadLocal(), + G1->getType()->getAddressSpace()); // Propagate alignment, visibility and section info. CopyGVAttributes(NG, G1); @@ -1179,7 +1175,7 @@ static bool LinkAppendingVars(Module *M, Inits.push_back(I->getOperand(i)); } else { assert(isa(G1->getInitializer())); - Constant *CV = Constant::getNullValue(T1->getElementType()); + Constant *CV = Context.getNullValue(T1->getElementType()); for (unsigned i = 0, e = T1->getNumElements(); i != e; ++i) Inits.push_back(CV); } @@ -1188,11 +1184,11 @@ static bool LinkAppendingVars(Module *M, Inits.push_back(I->getOperand(i)); } else { assert(isa(G2->getInitializer())); - Constant *CV = Constant::getNullValue(T2->getElementType()); + Constant *CV = Context.getNullValue(T2->getElementType()); for (unsigned i = 0, e = T2->getNumElements(); i != e; ++i) Inits.push_back(CV); } - NG->setInitializer(ConstantArray::get(NewType, Inits)); + NG->setInitializer(Context.getConstantArray(NewType, Inits)); Inits.clear(); // Replace any uses of the two global variables with uses of the new @@ -1200,8 +1196,10 @@ static bool LinkAppendingVars(Module *M, // FIXME: This should rewrite simple/straight-forward uses such as // getelementptr instructions to not use the Cast! - G1->replaceAllUsesWith(ConstantExpr::getBitCast(NG, G1->getType())); - G2->replaceAllUsesWith(ConstantExpr::getBitCast(NG, G2->getType())); + G1->replaceAllUsesWith(Context.getConstantExprBitCast(NG, + G1->getType())); + G2->replaceAllUsesWith(Context.getConstantExprBitCast(NG, + G2->getType())); // Remove the two globals from the module now... M->getGlobalList().erase(G1); @@ -1221,7 +1219,7 @@ static bool ResolveAliases(Module *Dest) { for (Module::alias_iterator I = Dest->alias_begin(), E = Dest->alias_end(); I != E; ++I) if (const GlobalValue *GV = I->resolveAliasedGlobal()) - if (!GV->isDeclaration()) + if (GV != I && !GV->isDeclaration()) I->replaceAllUsesWith(const_cast(GV)); return false; @@ -1263,7 +1261,7 @@ Linker::LinkModules(Module *Dest, Module *Src, std::string *ErrorMsg) { // Copy the target triple from the source to dest if the dest's is empty. if (Dest->getTargetTriple().empty() && !Src->getTargetTriple().empty()) Dest->setTargetTriple(Src->getTargetTriple()); - + if (!Src->getDataLayout().empty() && !Dest->getDataLayout().empty() && Src->getDataLayout() != Dest->getDataLayout()) cerr << "WARNING: Linking two modules of different data layouts!\n"; @@ -1279,18 +1277,18 @@ Linker::LinkModules(Module *Dest, Module *Src, std::string *ErrorMsg) { Dest->setModuleInlineAsm(Dest->getModuleInlineAsm()+"\n"+ Src->getModuleInlineAsm()); } - + // 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. for (Module::lib_iterator SI = Src->lib_begin(), SE = Src->lib_end(); - SI != SE; ++SI) + SI != SE; ++SI) Dest->addLibrary(*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)) + if (LinkTypes(Dest, Src, ErrorMsg)) return true; // ValueMap - Mapping of values from what they used to be in Src, to what they