#include "llvm/DerivedTypes.h"
#include "llvm/iOther.h"
#include "llvm/Constants.h"
-using std::cerr;
-using std::string;
-using std::map;
// Error - Simple wrapper function to conditionally assign to E and return true.
// This just makes error return conditions a little bit simpler...
//
-static inline bool Error(string *E, string Message) {
+static inline bool Error(std::string *E, const std::string &Message) {
if (E) *E = Message;
return true;
}
+// ResolveTypes - Attempt to link the two specified types together. Return true
+// if there is an error and they cannot yet be linked.
+//
+static bool ResolveTypes(Type *DestTy, Type *SrcTy, SymbolTable *DestST,
+ const std::string &Name) {
+ // Does the type already exist in the module?
+ if (DestTy && !isa<OpaqueType>(DestTy)) { // Yup, the type already exists...
+ if (DestTy == SrcTy) return false; // If already equal, noop
+ if (OpaqueType *OT = dyn_cast<OpaqueType>(SrcTy)) {
+ 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...
+ cast<OpaqueType>(DestTy)->refineAbstractTypeTo(SrcTy);
+ else
+ DestST->insert(Name, SrcTy);
+ }
+ return false;
+}
+
// 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, string *Err = 0) {
+static bool LinkTypes(Module *Dest, const Module *Src, std::string *Err) {
SymbolTable *DestST = &Dest->getSymbolTable();
const SymbolTable *SrcST = &Src->getSymbolTable();
SymbolTable::const_iterator PI = SrcST->find(Type::TypeTy);
if (PI == SrcST->end()) return false; // No named types, do nothing.
+ // Some types cannot be resolved immediately becuse they depend on other types
+ // being resolved to each other first. This contains a list of types we are
+ // waiting to recheck.
+ std::vector<std::string> DelayedTypesToResolve;
+
const SymbolTable::VarMap &VM = PI->second;
for (SymbolTable::type_const_iterator I = VM.begin(), E = VM.end();
I != E; ++I) {
- const string &Name = I->first;
- const Type *RHS = cast<Type>(I->second);
+ const std::string &Name = I->first;
+ Type *RHS = cast<Type>(I->second);
// Check to see if this type name is already in the dest module...
- const Type *Entry = cast_or_null<Type>(DestST->lookup(Type::TypeTy, Name));
- if (Entry) { // Yup, the value already exists...
- if (Entry != RHS) // If it's the same, noop. Otherwise, error.
- return Error(Err, "Type named '" + Name +
- "' of different shape in modules.\n Src='" +
- Entry->getDescription() + "'.\n Dst='" +
- RHS->getDescription() + "'");
- } else { // Type not in dest module. Add it now.
- // TODO: FIXME WHEN TYPES AREN'T CONST
- DestST->insert(Name, const_cast<Type*>(RHS));
+ Type *Entry = cast_or_null<Type>(DestST->lookup(Type::TypeTy, Name));
+
+ if (ResolveTypes(Entry, RHS, DestST, Name)) {
+ // They look different, save the types 'till later to resolve.
+ DelayedTypesToResolve.push_back(Name);
}
}
+
+ // Iteratively resolve types while we can...
+ while (!DelayedTypesToResolve.empty()) {
+ // Loop over all of the types, attempting to resolve them if possible...
+ unsigned OldSize = DelayedTypesToResolve.size();
+
+ for (unsigned i = 0; i != DelayedTypesToResolve.size(); ++i) {
+ const std::string &Name = DelayedTypesToResolve[i];
+ Type *T1 = cast<Type>(VM.find(Name)->second);
+ Type *T2 = cast<Type>(DestST->lookup(Type::TypeTy, Name));
+ if (!ResolveTypes(T2, T1, DestST, Name)) {
+ // We are making progress!
+ DelayedTypesToResolve.erase(DelayedTypesToResolve.begin()+i);
+ --i;
+ }
+ }
+
+ // Did we not eliminate any types?
+ if (DelayedTypesToResolve.size() == OldSize) {
+ // Build up an error message of all of the mismatched types.
+ std::string ErrorMessage;
+ for (unsigned i = 0, e = DelayedTypesToResolve.size(); i != e; ++i) {
+ const std::string &Name = DelayedTypesToResolve[i];
+ const Type *T1 = cast<Type>(VM.find(Name)->second);
+ const Type *T2 = cast<Type>(DestST->lookup(Type::TypeTy, Name));
+ ErrorMessage += " Type named '" + Name +
+ "' conflicts.\n Src='" + T1->getDescription() +
+ "'.\n Dest='" + T2->getDescription() + "'\n";
+ }
+ return Error(Err, "Type conflict between types in modules:\n" +
+ ErrorMessage);
+ }
+ }
+
+
return false;
}
-static void PrintMap(const map<const Value*, Value*> &M) {
- for (map<const Value*, Value*>::const_iterator I = M.begin(), E = M.end();
+static void PrintMap(const std::map<const Value*, Value*> &M) {
+ for (std::map<const Value*, Value*>::const_iterator I = M.begin(), E =M.end();
I != E; ++I) {
- cerr << " Fr: " << (void*)I->first << " ";
+ std::cerr << " Fr: " << (void*)I->first << " ";
I->first->dump();
- cerr << " To: " << (void*)I->second << " ";
+ std::cerr << " To: " << (void*)I->second << " ";
I->second->dump();
- cerr << "\n";
+ std::cerr << "\n";
}
}
// module to another. This is somewhat sophisticated in that it can
// automatically handle constant references correctly as well...
//
-static Value *RemapOperand(const Value *In, map<const Value*, Value*> &LocalMap,
- map<const Value*, Value*> *GlobalMap = 0) {
- map<const Value*,Value*>::const_iterator I = LocalMap.find(In);
+static Value *RemapOperand(const Value *In,
+ std::map<const Value*, Value*> &LocalMap,
+ std::map<const Value*, Value*> *GlobalMap) {
+ std::map<const Value*,Value*>::const_iterator I = LocalMap.find(In);
if (I != LocalMap.end()) return I->second;
if (GlobalMap) {
return Result;
}
- cerr << "XXX LocalMap: \n";
+ std::cerr << "XXX LocalMap: \n";
PrintMap(LocalMap);
if (GlobalMap) {
- cerr << "XXX GlobalMap: \n";
+ std::cerr << "XXX GlobalMap: \n";
PrintMap(*GlobalMap);
}
- cerr << "Couldn't remap value: " << (void*)In << " " << *In << "\n";
+ std::cerr << "Couldn't remap value: " << (void*)In << " " << *In << "\n";
assert(0 && "Couldn't remap value!");
return 0;
}
// LinkGlobals - Loop through the global variables in the src module and merge
-// them into the dest module...
+// them into the dest module.
//
static bool LinkGlobals(Module *Dest, const Module *Src,
- map<const Value*, Value*> &ValueMap, string *Err = 0) {
+ std::map<const Value*, Value*> &ValueMap,
+ std::multimap<std::string, GlobalVariable *> &AppendingVars,
+ std::string *Err) {
// We will need a module level symbol table if the src module has a module
// level symbol table...
- SymbolTable *ST = (SymbolTable*)&Src->getSymbolTable();
+ SymbolTable *ST = (SymbolTable*)&Dest->getSymbolTable();
// Loop over all of the globals in the src module, mapping them over as we go
//
for (Module::const_giterator I = Src->gbegin(), E = Src->gend(); I != E; ++I){
const GlobalVariable *SGV = I;
- Value *V;
-
- // If the global variable has a name, and that name is already in use in the
- // Dest module, make sure that the name is a compatible global variable...
- //
- if (SGV->hasExternalLinkage() && SGV->hasName() &&
- (V = ST->lookup(SGV->getType(), SGV->getName())) &&
- cast<GlobalVariable>(V)->hasExternalLinkage()) {
- // The same named thing is a global variable, because the only two things
+ GlobalVariable *DGV = 0;
+ if (SGV->hasName()) {
+ // A same named thing is a global variable, because the only two things
// that may be in a module level symbol table are Global Vars and
// Functions, and they both have distinct, nonoverlapping, possible types.
//
- GlobalVariable *DGV = cast<GlobalVariable>(V);
+ DGV = cast_or_null<GlobalVariable>(ST->lookup(SGV->getType(),
+ SGV->getName()));
+ }
- // Check to see if the two GV's have the same Const'ness...
- if (SGV->isConstant() != DGV->isConstant())
- return Error(Err, "Global Variable Collision on '" +
- SGV->getType()->getDescription() + "':%" + SGV->getName() +
- " - Global variables differ in const'ness");
+ assert(SGV->hasInitializer() || SGV->hasExternalLinkage() &&
+ "Global must either be external or have an initializer!");
- // Okay, everything is cool, remember the mapping...
- ValueMap.insert(std::make_pair(SGV, DGV));
- } else {
+ bool SGExtern = SGV->isExternal();
+ bool DGExtern = DGV ? DGV->isExternal() : false;
+
+ if (!DGV || DGV->hasInternalLinkage() || SGV->hasInternalLinkage()) {
// No linking to be performed, simply create an identical version of the
// symbol over in the dest module... the initializer will be filled in
// later by LinkGlobalInits...
//
- GlobalVariable *DGV =
- new GlobalVariable(SGV->getType()->getElementType(), SGV->isConstant(),
- SGV->hasInternalLinkage(), 0, SGV->getName());
-
- // Add the new global to the dest module
- Dest->getGlobalList().push_back(DGV);
+ GlobalVariable *NewDGV =
+ new GlobalVariable(SGV->getType()->getElementType(),
+ SGV->isConstant(), SGV->getLinkage(), /*init*/0,
+ SGV->getName(), Dest);
+
+ // If the LLVM runtime renamed the global, but it is an externally visible
+ // symbol, DGV must be an existing global with internal linkage. Rename
+ // it.
+ if (NewDGV->getName() != SGV->getName() && !NewDGV->hasInternalLinkage()){
+ assert(DGV && DGV->getName() == SGV->getName() &&
+ DGV->hasInternalLinkage());
+ DGV->setName("");
+ NewDGV->setName(SGV->getName()); // Force the name back
+ DGV->setName(SGV->getName()); // This will cause a renaming
+ assert(NewDGV->getName() == SGV->getName() &&
+ DGV->getName() != SGV->getName());
+ }
// Make sure to remember this mapping...
+ ValueMap.insert(std::make_pair(SGV, NewDGV));
+ 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->getLinkage() != DGV->getLinkage()) {
+ return Error(Err, "Global variables named '" + SGV->getName() +
+ "' have different linkage specifiers!");
+ } else if (SGV->hasExternalLinkage()) {
+ // Allow linking two exactly identical external global variables...
+ if (SGV->isConstant() != DGV->isConstant() ||
+ SGV->getInitializer() != DGV->getInitializer())
+ return Error(Err, "Global Variable Collision on '" +
+ SGV->getType()->getDescription() + " %" + SGV->getName() +
+ "' - Global variables differ in const'ness");
+ ValueMap.insert(std::make_pair(SGV, DGV));
+ } else if (SGV->hasLinkOnceLinkage()) {
+ // If the global variable has a name, and that name is already in use in
+ // the Dest module, make sure that the name is a compatible global
+ // variable...
+ //
+ // Check to see if the two GV's have the same Const'ness...
+ if (SGV->isConstant() != DGV->isConstant())
+ return Error(Err, "Global Variable Collision on '" +
+ SGV->getType()->getDescription() + " %" + SGV->getName() +
+ "' - Global variables differ in const'ness");
+
+ // Okay, everything is cool, remember the mapping...
+ ValueMap.insert(std::make_pair(SGV, DGV));
+ } else if (SGV->hasAppendingLinkage()) {
+ // 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(),
+ SGV->isConstant(), SGV->getLinkage(), /*init*/0,
+ "", Dest);
+
+ // Make sure to remember this mapping...
+ ValueMap.insert(std::make_pair(SGV, NewDGV));
+
+ // Keep track that this is an appending variable...
+ AppendingVars.insert(std::make_pair(SGV->getName(), NewDGV));
+ } else {
+ assert(0 && "Unknown linkage!");
}
}
return false;
// globals that may be referenced are in Dest.
//
static bool LinkGlobalInits(Module *Dest, const Module *Src,
- map<const Value*, Value*> &ValueMap,
- string *Err = 0) {
+ std::map<const Value*, Value*> &ValueMap,
+ std::string *Err) {
// Loop over all of the globals in the src module, mapping them over as we go
//
if (SGV->hasInitializer()) { // Only process initialized GV's
// Figure out what the initializer looks like in the dest module...
- Constant *DInit =
- cast<Constant>(RemapOperand(SGV->getInitializer(), ValueMap));
+ Constant *SInit =
+ cast<Constant>(RemapOperand(SGV->getInitializer(), ValueMap, 0));
GlobalVariable *DGV = cast<GlobalVariable>(ValueMap[SGV]);
- if (DGV->hasInitializer() && SGV->hasExternalLinkage() &&
- DGV->hasExternalLinkage()) {
- if (DGV->getInitializer() != DInit)
- return Error(Err, "Global Variable Collision on '" +
- SGV->getType()->getDescription() + "':%" +SGV->getName()+
- " - Global variables have different initializers");
+ if (DGV->hasInitializer()) {
+ assert(SGV->getLinkage() == DGV->getLinkage());
+ if (SGV->hasExternalLinkage()) {
+ if (DGV->getInitializer() != SInit)
+ return Error(Err, "Global Variable Collision on '" +
+ SGV->getType()->getDescription() +"':%"+SGV->getName()+
+ " - Global variables have different initializers");
+ } else if (DGV->hasLinkOnceLinkage()) {
+ // Nothing is required, mapped values will take the new global
+ // automatically.
+ } else if (DGV->hasAppendingLinkage()) {
+ assert(0 && "Appending linkage unimplemented!");
+ } else {
+ assert(0 && "Unknown linkage!");
+ }
} else {
// Copy the initializer over now...
- DGV->setInitializer(DInit);
+ DGV->setInitializer(SInit);
}
}
}
// to the Dest function...
//
static bool LinkFunctionProtos(Module *Dest, const Module *Src,
- map<const Value*, Value*> &ValueMap,
- string *Err = 0) {
- // We will need a module level symbol table if the src module has a module
- // level symbol table...
- SymbolTable *ST = (SymbolTable*)&Src->getSymbolTable();
+ std::map<const Value*, Value*> &ValueMap,
+ 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) {
const Function *SF = I; // SrcFunction
- Value *V;
-
- // If the function has a name, and that name is already in use in the Dest
- // module, make sure that the name is a compatible function...
- //
- if (SF->hasExternalLinkage() && SF->hasName() &&
- (V = ST->lookup(SF->getType(), SF->getName())) &&
- cast<Function>(V)->hasExternalLinkage()) {
+ Function *DF = 0;
+ if (SF->hasName())
// The same named thing is a Function, because the only two things
// that may be in a module level symbol table are Global Vars and
// Functions, and they both have distinct, nonoverlapping, possible types.
//
- Function *DF = cast<Function>(V); // DestFunction
-
- // Check to make sure the function is not defined in both modules...
- if (!SF->isExternal() && !DF->isExternal())
- return Error(Err, "Function '" +
- SF->getFunctionType()->getDescription() + "':\"" +
- SF->getName() + "\" - Function is already defined!");
-
- // Otherwise, just remember this mapping...
- ValueMap.insert(std::make_pair(SF, DF));
- } else {
- // Function does not already exist, simply insert an external function
- // signature identical to SF into the dest module...
- Function *DF = new Function(SF->getFunctionType(),
- SF->hasInternalLinkage(),
- SF->getName());
-
- // Add the function signature to the dest module...
- Dest->getFunctionList().push_back(DF);
+ DF = cast_or_null<Function>(ST->lookup(SF->getType(), SF->getName()));
+
+ if (!DF || SF->hasInternalLinkage() || DF->hasInternalLinkage()) {
+ // Function does not already exist, simply insert an function signature
+ // identical to SF into the dest module...
+ Function *NewDF = new Function(SF->getFunctionType(), SF->getLinkage(),
+ SF->getName(), Dest);
+
+ // If the LLVM runtime renamed the function, but it is an externally
+ // visible symbol, DF must be an existing function with internal linkage.
+ // Rename it.
+ if (NewDF->getName() != SF->getName() && !NewDF->hasInternalLinkage()) {
+ assert(DF && DF->getName() == SF->getName() &&DF->hasInternalLinkage());
+ DF->setName("");
+ NewDF->setName(SF->getName()); // Force the name back
+ DF->setName(SF->getName()); // This will cause a renaming
+ assert(NewDF->getName() == SF->getName() &&
+ DF->getName() != SF->getName());
+ }
// ... and remember this mapping...
+ ValueMap.insert(std::make_pair(SF, NewDF));
+ } else if (SF->isExternal()) {
+ // If SF is external or if both SF & DF are external.. Just link the
+ // external functions, we aren't adding anything.
+ ValueMap.insert(std::make_pair(SF, DF));
+ } else if (DF->isExternal()) { // If DF is external but SF is not...
+ // Link the external functions, update linkage qualifiers
+ ValueMap.insert(std::make_pair(SF, DF));
+ DF->setLinkage(SF->getLinkage());
+
+ } else if (SF->getLinkage() != DF->getLinkage()) {
+ return Error(Err, "Functions named '" + SF->getName() +
+ "' have different linkage specifiers!");
+ } else if (SF->hasExternalLinkage()) {
+ // The function is defined in both modules!!
+ return Error(Err, "Function '" +
+ SF->getFunctionType()->getDescription() + "':\"" +
+ SF->getName() + "\" - Function is already defined!");
+ } else if (SF->hasLinkOnceLinkage()) {
+ // Completely ignore the source function.
ValueMap.insert(std::make_pair(SF, DF));
+ } else {
+ assert(0 && "Unknown linkage configuration found!");
}
}
return false;
// function, and that Src is not.
//
static bool LinkFunctionBody(Function *Dest, const Function *Src,
- map<const Value*, Value*> &GlobalMap,
- string *Err = 0) {
+ std::map<const Value*, Value*> &GlobalMap,
+ std::string *Err) {
assert(Src && Dest && Dest->isExternal() && !Src->isExternal());
- map<const Value*, Value*> LocalMap; // Map for function local values
+ std::map<const Value*, Value*> LocalMap; // Map for function local values
// Go through and convert function arguments over...
Function::aiterator DI = Dest->abegin();
// function over and fixing up references to values.
//
static bool LinkFunctionBodies(Module *Dest, const Module *Src,
- map<const Value*, Value*> &ValueMap,
- string *Err = 0) {
+ std::map<const Value*, Value*> &ValueMap,
+ std::string *Err) {
// Loop over all of the functions in the src module, mapping them over as we
// go
// DF not external SF external?
if (!DF->isExternal()) {
+ if (DF->hasLinkOnceLinkage()) continue; // No relinkage for link-once!
if (Err)
- *Err = "Function '" + (SF->hasName() ? SF->getName() : string("")) +
- "' body multiply defined!";
+ *Err = "Function '" + (SF->hasName() ? SF->getName() :std::string(""))
+ + "' body multiply defined!";
return true;
}
return false;
}
+// LinkAppendingVars - If there were any appending global variables, link them
+// together now. Return true on error.
+//
+static bool LinkAppendingVars(Module *M,
+ 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
+ // and delete them.
+ //
+ std::vector<Constant*> Inits;
+ while (AppendingVars.size() > 1) {
+ // Get the first two elements in the map...
+ std::multimap<std::string,
+ GlobalVariable*>::iterator Second = AppendingVars.begin(), First=Second++;
+
+ // If the first two elements are for different names, there is no pair...
+ // Otherwise there is a pair, so link them together...
+ if (First->first == Second->first) {
+ 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,
+ "Appending variables with different element types need to be linked!");
+ if (G1->isConstant() != G2->isConstant())
+ return Error(ErrorMsg,
+ "Appending variables linked with different const'ness!");
+
+ unsigned NewSize = T1->getNumElements() + T2->getNumElements();
+ ArrayType *NewType = ArrayType::get(T1->getElementType(), NewSize);
+
+ // Create the new global variable...
+ GlobalVariable *NG =
+ new GlobalVariable(NewType, G1->isConstant(), G1->getLinkage(),
+ /*init*/0, First->first, M);
+
+ // Merge the initializer...
+ Inits.reserve(NewSize);
+ ConstantArray *I = cast<ConstantArray>(G1->getInitializer());
+ for (unsigned i = 0, e = T1->getNumElements(); i != e; ++i)
+ Inits.push_back(cast<Constant>(I->getValues()[i]));
+ I = cast<ConstantArray>(G2->getInitializer());
+ for (unsigned i = 0, e = T2->getNumElements(); i != e; ++i)
+ Inits.push_back(cast<Constant>(I->getValues()[i]));
+ NG->setInitializer(ConstantArray::get(NewType, Inits));
+ Inits.clear();
+
+ // Replace any uses of the two global variables with uses of the new
+ // global...
+
+ // FIXME: This should rewrite simple/straight-forward uses such as
+ // getelementptr instructions to not use the Cast!
+ ConstantPointerRef *NGCP = ConstantPointerRef::get(NG);
+ G1->replaceAllUsesWith(ConstantExpr::getCast(NGCP, G1->getType()));
+ G2->replaceAllUsesWith(ConstantExpr::getCast(NGCP, G2->getType()));
+
+ // Remove the two globals from the module now...
+ M->getGlobalList().erase(G1);
+ M->getGlobalList().erase(G2);
+
+ // Put the new global into the AppendingVars map so that we can handle
+ // linking of more than two vars...
+ Second->second = NG;
+ }
+ AppendingVars.erase(First);
+ }
+
+ return false;
+}
// LinkModules - This function links two modules together, with the resulting
// the problem. Upon failure, the Dest module could be in a modified state, and
// shouldn't be relied on to be consistent.
//
-bool LinkModules(Module *Dest, const Module *Src, string *ErrorMsg) {
+bool LinkModules(Module *Dest, const Module *Src, std::string *ErrorMsg) {
+ if (Dest->getEndianness() != Src->getEndianness())
+ std::cerr << "WARNING: Linking two modules of different endianness!\n";
+ if (Dest->getPointerSize() != Src->getPointerSize())
+ std::cerr << "WARNING: Linking two modules of different pointer size!\n";
// LinkTypes - Go through the symbol table of the Src module and see if any
// types are named in the src module that are not named in the Dst module.
// ValueMap - Mapping of values from what they used to be in Src, to what they
// are now in Dest.
//
- map<const Value*, Value*> ValueMap;
+ std::map<const Value*, Value*> 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<std::string, GlobalVariable *> AppendingVars;
- // Insert all of the globals in src into the Dest module... without
- // initializers
- if (LinkGlobals(Dest, Src, ValueMap, ErrorMsg)) return true;
+ // Add all of the appending globals already in the Dest module to
+ // AppendingVars.
+ for (Module::giterator I = Dest->gbegin(), E = Dest->gend(); I != E; ++I)
+ if (I->hasAppendingLinkage())
+ AppendingVars.insert(std::make_pair(I->getName(), I));
+
+ // 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, ErrorMsg)) return true;
// Link the functions together between the two modules, without doing function
// bodies... this just adds external function prototypes to the Dest
//
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;
+
return false;
}
projects / oota-llvm.git / blobdiff