//===- lib/Linker/LinkModules.cpp - Module Linker Implementation ----------===//
-//
+//
// The LLVM Compiler Infrastructure
//
// This file was developed by the LLVM research group and is distributed under
// the University of Illinois Open Source License. See LICENSE.TXT for details.
-//
+//
//===----------------------------------------------------------------------===//
//
// This file implements the LLVM module linker.
const Type *SrcTyT = SrcTy.get();
const Type *DestTyT = DestTy.get();
if (DestTyT == SrcTyT) 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);
-
+
// 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;
return false;
}
case Type::StructTyID: {
- if (getST(DestTy)->getNumContainedTypes() !=
+ 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),
return Result;
}
default: assert(0 && "Unexpected type!"); return true;
- }
+ }
}
static bool RecursiveResolveTypes(const PATypeHolder &DestTy,
if (!RecursiveResolveTypes(T2, T1, DestST, Name)) {
// We are making progress!
DelayedTypesToResolve.erase(DelayedTypesToResolve.begin()+i);
-
+
// Go back to the main loop, perhaps we can resolve directly by name
// now...
break;
}
// 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();
}
Result = const_cast<Constant*>(CPV);
} else if (isa<GlobalValue>(CPV)) {
Result = cast<Constant>(RemapOperand(CPV, ValueMap));
+ } else if (const ConstantPacked *CP = dyn_cast<ConstantPacked>(CPV)) {
+ std::vector<Constant*> Operands(CP->getNumOperands());
+ for (unsigned i = 0, e = CP->getNumOperands(); i != e; ++i)
+ Operands[i] = cast<Constant>(RemapOperand(CP->getOperand(i), ValueMap));
+ Result = ConstantPacked::get(Operands);
} else if (const ConstantExpr *CE = dyn_cast<ConstantExpr>(CPV)) {
if (CE->getOpcode() == Instruction::GetElementPtr) {
Value *Ptr = RemapOperand(CE->getOperand(0), ValueMap);
ValueMap)));
Result = ConstantExpr::getGetElementPtr(cast<Constant>(Ptr), Indices);
+ } else if (CE->getOpcode() == Instruction::ExtractElement) {
+ Value *Ptr = RemapOperand(CE->getOperand(0), ValueMap);
+ Value *Idx = RemapOperand(CE->getOperand(1), ValueMap);
+ Result = ConstantExpr::getExtractElement(cast<Constant>(Ptr),
+ cast<Constant>(Idx));
+ } else if (CE->getOpcode() == Instruction::InsertElement) {
+ Value *Ptr = RemapOperand(CE->getOperand(0), ValueMap);
+ Value *Elt = RemapOperand(CE->getOperand(1), ValueMap);
+ Value *Idx = RemapOperand(CE->getOperand(2), ValueMap);
+ Result = ConstantExpr::getInsertElement(cast<Constant>(Ptr),
+ cast<Constant>(Elt),
+ cast<Constant>(Idx));
+ } else if (CE->getOpcode() == Instruction::ShuffleVector) {
+ Value *V1 = RemapOperand(CE->getOperand(0), ValueMap);
+ Value *V2 = RemapOperand(CE->getOperand(1), ValueMap);
+ Result = ConstantExpr::getShuffleVector(cast<Constant>(V1),
+ cast<Constant>(V2),
+ cast<Constant>(CE->getOperand(2)));
} else if (CE->getNumOperands() == 1) {
// Cast instruction
assert(CE->getOpcode() == Instruction::Cast);
} else {
assert(Dest->hasExternalLinkage() && Src->hasExternalLinkage() &&
"Unexpected linkage type!");
- return Error(Err, "Linking globals named '" + Src->getName() +
+ return Error(Err, "Linking globals named '" + Src->getName() +
"': symbol multiply defined!");
}
return false;
}
-// Gross hack, see call sites.
-static void CoutHack(GlobalVariable *GV1, GlobalVariable *GV2) {
- const Type *GV1Ty = GV1->getType()->getElementType();
- const Type *GV2Ty = GV2->getType()->getElementType();
-
- if (GV1->isExternal() && isa<StructType>(GV1Ty) &&
- GV2->hasInitializer() && GV2->hasExternalLinkage() &&
- GV2->getInitializer()->isNullValue() && isa<ArrayType>(GV2Ty) &&
- cast<ArrayType>(GV2Ty)->getElementType() == Type::SByteTy) {
- GV1->setInitializer(Constant::getNullValue(GV1Ty));
- GV2->setInitializer(0);
- }
-}
-
// LinkGlobals - Loop through the global variables in the src module and merge
// them into the dest module.
static bool LinkGlobals(Module *Dest, Module *Src,
// We will need a module level symbol table if the src module has a module
// level symbol table...
SymbolTable *ST = (SymbolTable*)&Dest->getSymbolTable();
-
+
// Loop over all of the globals in the src module, mapping them over as we go
- for (Module::giterator I = Src->gbegin(), E = Src->gend(); I != E; ++I) {
+ for (Module::global_iterator I = Src->global_begin(), E = Src->global_end(); I != E; ++I) {
GlobalVariable *SGV = I;
GlobalVariable *DGV = 0;
// Check to see if may have to link the global.
assert(SGV->hasInitializer() || SGV->hasExternalLinkage() &&
"Global must either be external or have an initializer!");
- // This is a gross hack to handle cin/cout until PR400 is implemented. If
- // we are linking an external struct against a zero-initialized array of
- // sbytes, move the initializer from the array to the struct so we keep the
- // struct type.
- if (DGV) {
- CoutHack(DGV, SGV);
- CoutHack(SGV, DGV);
- }
-
GlobalValue::LinkageTypes NewLinkage;
bool LinkFromSrc;
if (GetLinkageResult(DGV, SGV, NewLinkage, LinkFromSrc, Err))
DGV->setLinkage(NewLinkage);
if (LinkFromSrc) {
- if (DGV->isConstant() && !SGV->isConstant())
- return Error(Err, "Global Variable Collision on global '" +
- SGV->getName() + "': variables differ in const'ness");
// Inherit const as appropriate
- if (SGV->isConstant()) DGV->setConstant(true);
+ DGV->setConstant(SGV->isConstant());
DGV->setInitializer(0);
} else {
if (SGV->isConstant() && !DGV->isConstant()) {
- if (!DGV->isExternal())
- return Error(Err, "Global Variable Collision on global '" +
- SGV->getName() + "': variables differ in const'ness");
- else
+ if (DGV->isExternal())
DGV->setConstant(true);
}
SGV->setLinkage(GlobalValue::ExternalLinkage);
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){
+ for (Module::const_global_iterator I = Src->global_begin(), E = Src->global_end(); I != E; ++I){
const GlobalVariable *SGV = I;
if (SGV->hasInitializer()) { // Only process initialized GV's
Constant *SInit =
cast<Constant>(RemapOperand(SGV->getInitializer(), ValueMap));
- GlobalVariable *DGV = cast<GlobalVariable>(ValueMap[SGV]);
+ GlobalVariable *DGV = cast<GlobalVariable>(ValueMap[SGV]);
if (DGV->hasInitializer()) {
if (SGV->hasExternalLinkage()) {
if (DGV->getInitializer() != SInit)
- return Error(Err, "Global Variable Collision on '" +
+ return Error(Err, "Global Variable Collision on '" +
ToStr(SGV->getType(), Src) +"':%"+SGV->getName()+
" - Global variables have different initializers");
} else if (DGV->hasLinkOnceLinkage() || DGV->hasWeakLinkage()) {
std::map<std::string, GlobalValue*> &GlobalsByName,
std::string *Err) {
SymbolTable *ST = (SymbolTable*)&Dest->getSymbolTable();
-
+
// 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) {
// identical to SF into the dest module...
Function *NewDF = new Function(SF->getFunctionType(), SF->getLinkage(),
SF->getName(), Dest);
+ NewDF->setCallingConv(SF->getCallingConv());
// If the LLVM runtime renamed the function, but it is an externally
// visible symbol, DF must be an existing function with internal linkage.
"' have different linkage specifiers!");
} else if (SF->hasExternalLinkage()) {
// The function is defined in both modules!!
- return Error(Err, "Function '" +
- ToStr(SF->getFunctionType(), Src) + "':\"" +
+ return Error(Err, "Function '" +
+ ToStr(SF->getFunctionType(), Src) + "':\"" +
SF->getName() + "\" - Function is already defined!");
} else {
assert(0 && "Unknown linkage configuration found!");
assert(Src && Dest && Dest->isExternal() && !Src->isExternal());
// Go through and convert function arguments over, remembering the mapping.
- Function::aiterator DI = Dest->abegin();
- for (Function::aiterator I = Src->abegin(), E = Src->aend();
+ Function::arg_iterator DI = Dest->arg_begin();
+ for (Function::arg_iterator I = Src->arg_begin(), E = Src->arg_end();
I != E; ++I, ++DI) {
DI->setName(I->getName()); // Copy the name information over...
*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)
+ for (Function::arg_iterator I = Src->arg_begin(), E = Src->arg_end(); I != E; ++I)
GlobalMap.erase(I);
return false;
std::multimap<std::string, GlobalVariable *> &AppendingVars,
std::string *ErrorMsg) {
if (AppendingVars.empty()) return false; // Nothing to do.
-
+
// 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
GlobalVariable *G1 = First->second, *G2 = Second->second;
const ArrayType *T1 = cast<ArrayType>(G1->getType()->getElementType());
const ArrayType *T2 = cast<ArrayType>(G2->getType()->getElementType());
-
+
// Check to see that they two arrays agree on type...
if (T1->getElementType() != T2->getElementType())
return Error(ErrorMsg,
unsigned NewSize = T1->getNumElements() + T2->getNumElements();
ArrayType *NewType = ArrayType::get(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(),
// 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, 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");
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())
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";
+
+ if (!Src->getModuleInlineAsm().empty()) {
+ if (Dest->getModuleInlineAsm().empty())
+ Dest->setModuleInlineAsm(Src->getModuleInlineAsm());
+ else
+ 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.
// it's functionality here.
std::map<std::string, GlobalValue*> GlobalsByName;
- for (Module::giterator I = Dest->gbegin(), E = Dest->gend(); I != E; ++I) {
+ for (Module::global_iterator I = Dest->global_begin(), E = Dest->global_end(); I != E; ++I) {
// Add all of the appending globals already in the Dest module to
// AppendingVars.
if (I->hasAppendingLinkage())
// 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());
+ modId.set(Src->getModuleIdentifier());
if (!modId.isEmpty())
Dest->removeLibrary(modId.getBasename());
projects / oota-llvm.git / blobdiff