#include "llvm/Assembly/Writer.h"
#include "llvm/Support/Streams.h"
#include "llvm/System/Path.h"
+#include "llvm/ADT/DenseMap.h"
#include <sstream>
using namespace llvm;
// Inputs:
// DestTy - The type to which we wish to resolve.
// SrcTy - The original type which we want to resolve.
-// Name - The name of the type.
//
// Outputs:
// DestST - The symbol table in which the new type should be placed.
// true - There is an error and the types cannot yet be linked.
// false - No errors.
//
-static bool ResolveTypes(const Type *DestTy, const Type *SrcTy,
- TypeSymbolTable *DestST, const std::string &Name) {
+static bool ResolveTypes(const Type *DestTy, const Type *SrcTy) {
if (DestTy == SrcTy) return false; // If already equal, noop
+ assert(DestTy && SrcTy && "Can't handle null types");
- // Does the type already exist in the module?
- if (DestTy && !isa<OpaqueType>(DestTy)) { // Yup, the type already exists...
- if (const OpaqueType *OT = dyn_cast<OpaqueType>(SrcTy)) {
- const_cast<OpaqueType*>(OT)->refineAbstractTypeTo(DestTy);
- } else {
- return true; // Cannot link types... neither is opaque and not-equal
- }
- } else { // Type not in dest module. Add it now.
- if (DestTy) // Type _is_ in module, just opaque...
- const_cast<OpaqueType*>(cast<OpaqueType>(DestTy))
- ->refineAbstractTypeTo(SrcTy);
- else if (!Name.empty())
- DestST->insert(Name, const_cast<Type*>(SrcTy));
+ if (const OpaqueType *OT = dyn_cast<OpaqueType>(DestTy)) {
+ // Type _is_ in module, just opaque...
+ const_cast<OpaqueType*>(OT)->refineAbstractTypeTo(SrcTy);
+ } else if (const OpaqueType *OT = dyn_cast<OpaqueType>(SrcTy)) {
+ const_cast<OpaqueType*>(OT)->refineAbstractTypeTo(DestTy);
+ } else {
+ return true; // Cannot link types... not-equal and neither is opaque.
}
return false;
}
-static const FunctionType *getFT(const PATypeHolder &TH) {
- return cast<FunctionType>(TH.get());
-}
-static const StructType *getST(const PATypeHolder &TH) {
- return cast<StructType>(TH.get());
+/// LinkerTypeMap - This implements a map of types that is stable
+/// even if types are resolved/refined to other types. This is not a general
+/// purpose map, it is specific to the linker's use.
+namespace {
+class LinkerTypeMap : public AbstractTypeUser {
+ typedef DenseMap<const Type*, PATypeHolder> TheMapTy;
+ TheMapTy TheMap;
+
+ LinkerTypeMap(const LinkerTypeMap&); // DO NOT IMPLEMENT
+ void operator=(const LinkerTypeMap&); // DO NOT IMPLEMENT
+public:
+ LinkerTypeMap() {}
+ ~LinkerTypeMap() {
+ for (DenseMap<const Type*, PATypeHolder>::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 {
+ TheMapTy::const_iterator I = TheMap.find(Ty);
+ 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))
+ return false;
+ if (Ty->isAbstract())
+ 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))))
+ 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
+ /// its internal state to reference NewType instead of OldType.
+ ///
+ virtual void refineAbstractType(const DerivedType *OldTy,
+ const Type *NewTy) {
+ TheMapTy::iterator I = TheMap.find(OldTy);
+ const Type *DstTy = I->second;
+
+ TheMap.erase(I);
+ if (OldTy->isAbstract())
+ OldTy->removeAbstractTypeUser(this);
+
+ // Don't reinsert into the map if the key is concrete now.
+ 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
+ /// notifies ATU's when this occurs for a type.
+ virtual void typeBecameConcrete(const DerivedType *AbsTy) {
+ TheMap.erase(AbsTy);
+ AbsTy->removeAbstractTypeUser(this);
+ }
+
+ // for debugging...
+ virtual void dump() const {
+ cerr << "AbstractTypeSet!\n";
+ }
+};
}
+
// 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,
- TypeSymbolTable *DestST,
- const std::string &Name,
- std::vector<std::pair<PATypeHolder, PATypeHolder> > &Pointers) {
- const Type *SrcTyT = SrcTy.get();
- const Type *DestTyT = DestTy.get();
- if (DestTyT == SrcTyT) return false; // If already equal, noop
+static bool RecursiveResolveTypesI(const Type *DstTy, const Type *SrcTy,
+ LinkerTypeMap &Pointers) {
+ if (DstTy == SrcTy) return false; // If already equal, noop
// If we found our opaque type, resolve it now!
- if (isa<OpaqueType>(DestTyT) || isa<OpaqueType>(SrcTyT))
- return ResolveTypes(DestTyT, SrcTyT, DestST, Name);
+ if (isa<OpaqueType>(DstTy) || isa<OpaqueType>(SrcTy))
+ return ResolveTypes(DstTy, SrcTy);
// Two types cannot be resolved together if they are of different primitive
// type. For example, we cannot resolve an int to a float.
- if (DestTyT->getTypeID() != SrcTyT->getTypeID()) return true;
+ if (DstTy->getTypeID() != SrcTy->getTypeID()) return true;
+ // 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 (DestTyT->getTypeID()) {
- case Type::IntegerTyID: {
- if (cast<IntegerType>(DestTyT)->getBitWidth() !=
- cast<IntegerType>(SrcTyT)->getBitWidth())
- return true;
- return false;
- }
+ switch (DstTy->getTypeID()) {
+ default:
+ return true;
case Type::FunctionTyID: {
- if (cast<FunctionType>(DestTyT)->isVarArg() !=
- cast<FunctionType>(SrcTyT)->isVarArg() ||
- cast<FunctionType>(DestTyT)->getNumContainedTypes() !=
- cast<FunctionType>(SrcTyT)->getNumContainedTypes())
+ const FunctionType *DstFT = cast<FunctionType>(DstTy);
+ const FunctionType *SrcFT = cast<FunctionType>(SrcTy);
+ if (DstFT->isVarArg() != SrcFT->isVarArg() ||
+ DstFT->getNumContainedTypes() != SrcFT->getNumContainedTypes())
return true;
- for (unsigned i = 0, e = getFT(DestTy)->getNumContainedTypes(); i != e; ++i)
- if (RecursiveResolveTypesI(getFT(DestTy)->getContainedType(i),
- getFT(SrcTy)->getContainedType(i), DestST, "",
- Pointers))
+
+ // 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) {
+ const Type *SE = ST->getContainedType(i), *DE = DT->getContainedType(i);
+ if (SE != DE && RecursiveResolveTypesI(DE, SE, Pointers))
return true;
+ }
return false;
}
case Type::StructTyID: {
- if (getST(DestTy)->getNumContainedTypes() !=
- getST(SrcTy)->getNumContainedTypes()) return 1;
- for (unsigned i = 0, e = getST(DestTy)->getNumContainedTypes(); i != e; ++i)
- if (RecursiveResolveTypesI(getST(DestTy)->getContainedType(i),
- getST(SrcTy)->getContainedType(i), DestST, "",
- Pointers))
+ const StructType *DstST = cast<StructType>(DstTy);
+ const StructType *SrcST = cast<StructType>(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);
+ if (SE != DE && RecursiveResolveTypesI(DE, SE, Pointers))
return true;
+ }
return false;
}
case Type::ArrayTyID: {
- const ArrayType *DAT = cast<ArrayType>(DestTy.get());
- const ArrayType *SAT = cast<ArrayType>(SrcTy.get());
+ const ArrayType *DAT = cast<ArrayType>(DstTy);
+ const ArrayType *SAT = cast<ArrayType>(SrcTy);
if (DAT->getNumElements() != SAT->getNumElements()) return true;
return RecursiveResolveTypesI(DAT->getElementType(), SAT->getElementType(),
- DestST, "", Pointers);
+ Pointers);
+ }
+ case Type::VectorTyID: {
+ const VectorType *DVT = cast<VectorType>(DstTy);
+ const VectorType *SVT = cast<VectorType>(SrcTy);
+ if (DVT->getNumElements() != SVT->getNumElements()) return true;
+ return RecursiveResolveTypesI(DVT->getElementType(), SVT->getElementType(),
+ Pointers);
}
case Type::PointerTyID: {
+ const PointerType *DstPT = cast<PointerType>(DstTy);
+ const PointerType *SrcPT = cast<PointerType>(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
- // 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;
-
+ // in the container) change whenever types get resolved.
+ 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;
// Otherwise, add the current pointers to the vector to stop recursion on
// this pair.
- Pointers.push_back(std::make_pair(DestTyT, SrcTyT));
- bool Result =
- RecursiveResolveTypesI(cast<PointerType>(DestTy.get())->getElementType(),
- cast<PointerType>(SrcTy.get())->getElementType(),
- DestST, "", Pointers);
- Pointers.pop_back();
- return Result;
+ if (DstPT->isAbstract())
+ Pointers.insert(DstPT, SrcPT);
+ if (SrcPT->isAbstract())
+ Pointers.insert(SrcPT, DstPT);
+
+ return RecursiveResolveTypesI(DstPT->getElementType(),
+ SrcPT->getElementType(), Pointers);
}
- default: assert(0 && "Unexpected type!"); return true;
}
}
-static bool RecursiveResolveTypes(const PATypeHolder &DestTy,
- const PATypeHolder &SrcTy,
- TypeSymbolTable *DestST,
- const std::string &Name){
- std::vector<std::pair<PATypeHolder, PATypeHolder> > PointerTypes;
- return RecursiveResolveTypesI(DestTy, SrcTy, DestST, Name, PointerTypes);
+static bool RecursiveResolveTypes(const Type *DestTy, const Type *SrcTy) {
+ LinkerTypeMap PointerTypes;
+ return RecursiveResolveTypesI(DestTy, SrcTy, PointerTypes);
}
const std::string &Name = TI->first;
const Type *RHS = TI->second;
- // Check to see if this type name is already in the dest module...
+ // Check to see if this type name is already in the dest module.
Type *Entry = DestST->lookup(Name);
- if (ResolveTypes(Entry, RHS, DestST, Name)) {
+ // If the name is just in the source module, bring it over to the dest.
+ if (Entry == 0) {
+ if (!Name.empty())
+ DestST->insert(Name, const_cast<Type*>(RHS));
+ } else if (ResolveTypes(Entry, RHS)) {
// They look different, save the types 'till later to resolve.
DelayedTypesToResolve.push_back(Name);
}
const std::string &Name = DelayedTypesToResolve[i];
Type *T1 = SrcST->lookup(Name);
Type *T2 = DestST->lookup(Name);
- if (!ResolveTypes(T2, T1, DestST, Name)) {
+ if (!ResolveTypes(T2, T1)) {
// We are making progress!
DelayedTypesToResolve.erase(DelayedTypesToResolve.begin()+i);
--i;
// two types: { int* } and { opaque* }
for (unsigned i = 0, e = DelayedTypesToResolve.size(); i != e; ++i) {
const std::string &Name = DelayedTypesToResolve[i];
- PATypeHolder T1(SrcST->lookup(Name));
- PATypeHolder T2(DestST->lookup(Name));
-
- if (!RecursiveResolveTypes(T2, T1, DestST, Name)) {
+ if (!RecursiveResolveTypes(SrcST->lookup(Name), DestST->lookup(Name))) {
// We are making progress!
DelayedTypesToResolve.erase(DelayedTypesToResolve.begin()+i);
/// CopyGVAttributes - copy additional attributes (those not needed to construct
/// a GlobalValue) from the SrcGV to the DestGV.
static void CopyGVAttributes(GlobalValue *DestGV, const GlobalValue *SrcGV) {
- // Propagate alignment, visibility and section info.
- DestGV->setAlignment(std::max(DestGV->getAlignment(), SrcGV->getAlignment()));
- DestGV->setSection(SrcGV->getSection());
- DestGV->setVisibility(SrcGV->getVisibility());
- if (const Function *SrcF = dyn_cast<Function>(SrcGV)) {
- Function *DestF = cast<Function>(DestGV);
- DestF->setCallingConv(SrcF->getCallingConv());
- DestF->setParamAttrs(SrcF->getParamAttrs());
- if (SrcF->hasCollector())
- DestF->setCollector(SrcF->getCollector());
- } else if (const GlobalVariable *SrcVar = dyn_cast<GlobalVariable>(SrcGV)) {
- GlobalVariable *DestVar = cast<GlobalVariable>(DestGV);
- DestVar->setThreadLocal(SrcVar->isThreadLocal());
- }
+ // Use the maximum alignment, rather than just copying the alignment of SrcGV.
+ unsigned Alignment = std::max(DestGV->getAlignment(), SrcGV->getAlignment());
+ DestGV->copyAttributesFrom(SrcGV);
+ DestGV->setAlignment(Alignment);
}
/// GetLinkageResult - This analyzes the two global values and determines what
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(),
- &Dest->getTypeSymbolTable(), "");
+ RecursiveResolveTypes(SGV->getType(), DGV->getType());
}
// Check to see if may have to link the global with the alias
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(),
- &Dest->getTypeSymbolTable(), "");
+ RecursiveResolveTypes(SGV->getType(), DGV->getType());
}
if (DGV && DGV->hasInternalLinkage())
GlobalVariable *NewDGV =
new GlobalVariable(SGV->getType()->getElementType(),
SGV->isConstant(), SGV->getLinkage(), /*init*/0,
- SGV->getName(), Dest);
+ SGV->getName(), Dest, false,
+ SGV->getType()->getAddressSpace());
// Propagate alignment, visibility and section info.
CopyGVAttributes(NewDGV, SGV);
GlobalVariable *NewDGV =
new GlobalVariable(SGV->getType()->getElementType(),
SGV->isConstant(), SGV->getLinkage(), /*init*/0,
- "", Dest);
+ "", Dest, false,
+ SGV->getType()->getAddressSpace());
// Set alignment allowing CopyGVAttributes merge it with alignment of SGV.
NewDGV->setAlignment(DGV->getAlignment());
GlobalVariable *NewDGV =
new GlobalVariable(SGV->getType()->getElementType(),
DGVar->isConstant(), DGVar->getLinkage(),
- /*init*/0, DGVar->getName(), Dest);
+ /*init*/0, DGVar->getName(), Dest, false,
+ SGV->getType()->getAddressSpace());
CopyGVAttributes(NewDGV, DGVar);
DGV->replaceAllUsesWith(ConstantExpr::getBitCast(NewDGV,
DGVar->getType()));
// 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(),
- &Dest->getTypeSymbolTable(), ""))
+ if (RecursiveResolveTypes(SGA->getType(), DGV->getType()))
return Error(Err, "Alias Collision on '" + SGA->getName()+
"': aliases have different types");
}
// 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(),
- &Dest->getTypeSymbolTable(), ""))
+ if (RecursiveResolveTypes(SGA->getType(), DGV->getType()))
return Error(Err, "Alias Collision on '" + SGA->getName()+
"': aliases have different types");
}
// 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(),
- &Dest->getTypeSymbolTable(), ""))
+ if (RecursiveResolveTypes(SGA->getType(), DGV->getType()))
return Error(Err, "Alias Collision on '" + SGA->getName()+
"': aliases have different types");
}
// 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;
+ Value *MappedDF;
+
+ // 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 && SF->getType() != DF->getType())
- // If types don't agree because of opaque, try to resolve them
- RecursiveResolveTypes(SF->getType(), DF->getType(),
- &Dest->getTypeSymbolTable(), "");
+ if (DF && DF->hasInternalLinkage())
+ DF = 0;
}
-
- // Check visibility
- if (DF && !DF->hasInternalLinkage() &&
- SF->getVisibility() != DF->getVisibility()) {
+
+ // If there is no linkage to be performed, just bring over SF without
+ // modifying it.
+ if (DF == 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())
+ 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 && DF->hasInternalLinkage())
- DF = NULL;
-
- if (DF && DF->getType() != SF->getType()) {
+ 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(),
+ Function *NewDF = Function::Create(SF->getFunctionType(),
+ SF->getLinkage(),
SF->getName(), Dest);
CopyGVAttributes(NewDF, SF);
// 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());
+ continue;
} 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) + "'");
+ // We have two functions of the same name but different type. Any use
+ // of the source must be mapped to the destination, with a cast.
+ MappedDF = ConstantExpr::getBitCast(DF, SF->getType());
}
- } else 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 = 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->getName() != SF->getName() && !NewDF->hasInternalLinkage())
- ForceRenaming(NewDF, SF->getName());
-
- // ... and remember this mapping...
- ValueMap[SF] = NewDF;
- } else if (SF->isDeclaration()) {
+ } else {
+ MappedDF = DF;
+ }
+
+ 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.insert(std::make_pair(SF, DF));
+ ValueMap[SF] = MappedDF;
DF->setLinkage(SF->getLinkage());
- }
+ }
} else {
- ValueMap[SF] = DF;
- }
- } else if (DF->isDeclaration() && !DF->hasDLLImportLinkage()) {
- // If DF is external but SF is not...
- // Link the external functions, update linkage qualifiers
- ValueMap.insert(std::make_pair(SF, DF));
+ ValueMap[SF] = MappedDF;
+ }
+ 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, MappedDF));
DF->setLinkage(SF->getLinkage());
- // Visibility of prototype is overridden by vis of definition.
- DF->setVisibility(SF->getVisibility());
- } else if (SF->hasWeakLinkage() || SF->hasLinkOnceLinkage() ||
- SF->hasCommonLinkage()) {
- // At this point we know that DF has LinkOnce, Weak, or External* linkage.
- ValueMap[SF] = DF;
+ continue;
+ }
+
+ // At this point we know that DF has LinkOnce, Weak, or External* linkage.
+ if (SF->hasWeakLinkage() || SF->hasLinkOnceLinkage() ||
+ SF->hasCommonLinkage()) {
+ ValueMap[SF] = MappedDF;
// Linkonce+Weak = Weak
// *+External Weak = *
(SF->hasWeakLinkage() || SF->hasCommonLinkage())) ||
DF->hasExternalWeakLinkage())
DF->setLinkage(SF->getLinkage());
- } else if (DF->hasWeakLinkage() || DF->hasLinkOnceLinkage() ||
- DF->hasCommonLinkage()) {
+ continue;
+ }
+
+ if (DF->hasWeakLinkage() || DF->hasLinkOnceLinkage() ||
+ DF->hasCommonLinkage()) {
// At this point we know that SF has LinkOnce or External* linkage.
- ValueMap[SF] = DF;
- if (!SF->hasLinkOnceLinkage() && !SF->hasExternalWeakLinkage())
- // Don't inherit linkonce & external weak linkage
+ ValueMap[SF] = MappedDF;
+
+ // 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());
- } 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 identically in both modules!!
+ DF->deleteBody();
+ }
+ continue;
+ }
+
+ 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!");
- } else {
- assert(0 && "Unknown linkage configuration found!");
- }
+ assert(0 && "Unknown linkage configuration found!");
}
return false;
}
// 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<Function>(ValueMap[SF]); // Destination function
+ Function *DF = dyn_cast<Function>(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;
// Create the new global variable...
GlobalVariable *NG =
new GlobalVariable(NewType, G1->isConstant(), G1->getLinkage(),
- /*init*/0, First->first, M, G1->isThreadLocal());
+ /*init*/0, First->first, M, G1->isThreadLocal(),
+ G1->getType()->getAddressSpace());
// Propagate alignment, visibility and section info.
CopyGVAttributes(NG, G1);
projects / oota-llvm.git / blobdiff