X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FVMCore%2FLinker.cpp;h=fb83e027b06ced8aac737b54b5f982ca570ec0e2;hb=d05e22cb6f7b5dfbc50d95ddc0165674320c0e01;hp=f265bb05d17b6d020bd8d9f3559e9544a214e60d;hpb=221d688a5ef21a22c2368c9fff0e92d7966c95e5;p=oota-llvm.git diff --git a/lib/VMCore/Linker.cpp b/lib/VMCore/Linker.cpp index f265bb05d17..fb83e027b06 100644 --- a/lib/VMCore/Linker.cpp +++ b/lib/VMCore/Linker.cpp @@ -5,19 +5,20 @@ // Specifically, this: // * Merges global variables between the two modules // * Uninit + Uninit = Init, Init + Uninit = Init, Init + Init = Error if != -// * Merges methods between two modules +// * Merges functions between two modules // //===----------------------------------------------------------------------===// -#include "llvm/Transforms/Linker.h" +#include "llvm/Transforms/Utils/Linker.h" #include "llvm/Module.h" -#include "llvm/Method.h" +#include "llvm/Function.h" #include "llvm/BasicBlock.h" #include "llvm/GlobalVariable.h" #include "llvm/SymbolTable.h" #include "llvm/DerivedTypes.h" #include "llvm/iOther.h" -#include "llvm/ConstantVals.h" +#include "llvm/Constants.h" +#include "llvm/Argument.h" #include using std::cerr; using std::string; @@ -31,9 +32,6 @@ static inline bool Error(string *E, string Message) { return true; } -#include "llvm/Assembly/Writer.h" // TODO: REMOVE - - // 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. @@ -61,7 +59,7 @@ static bool LinkTypes(Module *Dest, const Module *Src, string *Err = 0) { 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() + "'. Dest='" + + Entry->getDescription() + "'.\n Dst='" + RHS->getDescription() + "'"); } else { // Type not in dest module. Add it now. // TODO: FIXME WHEN TYPES AREN'T CONST @@ -74,8 +72,11 @@ static bool LinkTypes(Module *Dest, const Module *Src, string *Err = 0) { static void PrintMap(const map &M) { for (map::const_iterator I = M.begin(), E = M.end(); I != E; ++I) { - cerr << " Fr: " << (void*)I->first << " " << I->first - << " To: " << (void*)I->second << " " << I->second << "\n"; + cerr << " Fr: " << (void*)I->first << " "; + I->first->dump(); + cerr << " To: " << (void*)I->second << " "; + I->second->dump(); + cerr << "\n"; } } @@ -95,20 +96,20 @@ static Value *RemapOperand(const Value *In, map &LocalMap, } // Check to see if it's a constant that we are interesting in transforming... - if (Constant *CPV = dyn_cast(In)) { + if (const Constant *CPV = dyn_cast(In)) { if (!isa(CPV->getType())) - return CPV; // Simple constants stay identical... + return const_cast(CPV); // Simple constants stay identical... Constant *Result = 0; - if (ConstantArray *CPA = dyn_cast(CPV)) { + if (const ConstantArray *CPA = dyn_cast(CPV)) { const std::vector &Ops = CPA->getValues(); std::vector Operands(Ops.size()); for (unsigned i = 0; i < Ops.size(); ++i) Operands[i] = cast(RemapOperand(Ops[i], LocalMap, GlobalMap)); Result = ConstantArray::get(cast(CPA->getType()), Operands); - } else if (ConstantStruct *CPS = dyn_cast(CPV)) { + } else if (const ConstantStruct *CPS = dyn_cast(CPV)) { const std::vector &Ops = CPS->getValues(); std::vector Operands(Ops.size()); for (unsigned i = 0; i < Ops.size(); ++i) @@ -116,8 +117,9 @@ static Value *RemapOperand(const Value *In, map &LocalMap, cast(RemapOperand(Ops[i], LocalMap, GlobalMap)); Result = ConstantStruct::get(cast(CPS->getType()), Operands); } else if (isa(CPV)) { - Result = CPV; - } else if (ConstantPointerRef *CPR = dyn_cast(CPV)) { + Result = const_cast(CPV); + } else if (const ConstantPointerRef *CPR = + dyn_cast(CPV)) { Value *V = RemapOperand(CPR->getValue(), LocalMap, GlobalMap); Result = ConstantPointerRef::get(cast(V)); } else { @@ -125,7 +127,7 @@ static Value *RemapOperand(const Value *In, map &LocalMap, } // Cache the mapping in our local map structure... - LocalMap.insert(std::make_pair(In, CPV)); + LocalMap.insert(std::make_pair(In, const_cast(CPV))); return Result; } @@ -137,7 +139,9 @@ static Value *RemapOperand(const Value *In, map &LocalMap, PrintMap(*GlobalMap); } - cerr << "Couldn't remap value: " << (void*)In << " " << In << "\n"; + cerr << "Couldn't remap value: " << (void*)In << " "; + In->dump(); + cerr << "\n"; assert(0 && "Couldn't remap value!"); return 0; } @@ -155,7 +159,7 @@ static bool LinkGlobals(Module *Dest, const Module *Src, // 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; + const GlobalVariable *SGV = I; Value *V; // If the global variable has a name, and that name is already in use in the @@ -165,8 +169,8 @@ static bool LinkGlobals(Module *Dest, const Module *Src, (V = ST->lookup(SGV->getType(), SGV->getName())) && cast(V)->hasExternalLinkage()) { // The 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 Methods, - // and they both have distinct, nonoverlapping, possible types. + // 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(V); @@ -208,7 +212,7 @@ static bool LinkGlobalInits(Module *Dest, const Module *Src, // 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; + const GlobalVariable *SGV = I; if (SGV->hasInitializer()) { // Only process initialized GV's // Figure out what the initializer looks like in the dest module... @@ -231,91 +235,88 @@ static bool LinkGlobalInits(Module *Dest, const Module *Src, return false; } -// LinkMethodProtos - Link the methods together between the two modules, without -// doing method bodies... this just adds external method prototypes to the Dest -// method... +// LinkFunctionProtos - Link the functions together between the two modules, +// without doing function bodies... this just adds external function prototypes +// to the Dest function... // -static bool LinkMethodProtos(Module *Dest, const Module *Src, - map &ValueMap, - string *Err = 0) { +static bool LinkFunctionProtos(Module *Dest, const Module *Src, + map &ValueMap, + string *Err = 0) { // We will need a module level symbol table if the src module has a module // level symbol table... SymbolTable *ST = Src->getSymbolTable() ? Dest->getSymbolTableSure() : 0; - // Loop over all of the methods in the src module, mapping them over as we go + // 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 Method *SM = *I; // SrcMethod + const Function *SF = I; // SrcFunction Value *V; - // If the method has a name, and that name is already in use in the - // Dest module, make sure that the name is a compatible method... + // 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 (SM->hasExternalLinkage() && SM->hasName() && - (V = ST->lookup(SM->getType(), SM->getName())) && - cast(V)->hasExternalLinkage()) { - // The same named thing is a Method, because the only two things - // that may be in a module level symbol table are Global Vars and Methods, - // and they both have distinct, nonoverlapping, possible types. + if (SF->hasExternalLinkage() && SF->hasName() && + (V = ST->lookup(SF->getType(), SF->getName())) && + cast(V)->hasExternalLinkage()) { + // 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. // - Method *DM = cast(V); // DestMethod + Function *DF = cast(V); // DestFunction - // Check to make sure the method is not defined in both modules... - if (!SM->isExternal() && !DM->isExternal()) - return Error(Err, "Method '" + - SM->getMethodType()->getDescription() + "':\"" + - SM->getName() + "\" - Method is already defined!"); + // 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(SM, DM)); + ValueMap.insert(std::make_pair(SF, DF)); } else { - // Method does not already exist, simply insert an external method - // signature identical to SM into the dest module... - Method *DM = new Method(SM->getMethodType(), SM->hasInternalLinkage(), - SM->getName()); + // 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 method signature to the dest module... - Dest->getMethodList().push_back(DM); + // Add the function signature to the dest module... + Dest->getFunctionList().push_back(DF); // ... and remember this mapping... - ValueMap.insert(std::make_pair(SM, DM)); + ValueMap.insert(std::make_pair(SF, DF)); } } return false; } -// LinkMethodBody - Copy the source method over into the dest method and fix up -// references to values. At this point we know that Dest is an external method, -// and that Src is not. +// LinkFunctionBody - Copy the source function over into the dest function and +// fix up references to values. At this point we know that Dest is an external +// function, and that Src is not. // -static bool LinkMethodBody(Method *Dest, const Method *Src, - const map &GlobalMap, - string *Err = 0) { +static bool LinkFunctionBody(Function *Dest, const Function *Src, + const map &GlobalMap, + string *Err = 0) { assert(Src && Dest && Dest->isExternal() && !Src->isExternal()); - map LocalMap; // Map for method local values - - // Go through and convert method arguments over... - for (Method::ArgumentListType::const_iterator - I = Src->getArgumentList().begin(), - E = Src->getArgumentList().end(); I != E; ++I) { - const MethodArgument *SMA = *I; + map LocalMap; // Map for function local values - // Create the new method argument and add to the dest method... - MethodArgument *DMA = new MethodArgument(SMA->getType(), SMA->getName()); - Dest->getArgumentList().push_back(DMA); + // Go through and convert function arguments over... + for (Function::const_aiterator I = Src->abegin(), E = Src->aend(); + I != E; ++I) { + // Create the new function argument and add to the dest function... + Argument *DFA = new Argument(I->getType(), I->getName()); + Dest->getArgumentList().push_back(DFA); // Add a mapping to our local map - LocalMap.insert(std::make_pair(SMA, DMA)); + LocalMap.insert(std::make_pair(I, DFA)); } // Loop over all of the basic blocks, copying the instructions over... // - for (Method::const_iterator I = Src->begin(), E = Src->end(); I != E; ++I) { - const BasicBlock *SBB = *I; - - // Create new basic block and add to mapping and the Dest method... - BasicBlock *DBB = new BasicBlock(SBB->getName(), Dest); - LocalMap.insert(std::make_pair(SBB, DBB)); + for (Function::const_iterator I = Src->begin(), E = Src->end(); I != E; ++I) { + // Create new basic block and add to mapping and the Dest function... + BasicBlock *DBB = new BasicBlock(I->getName(), Dest); + LocalMap.insert(std::make_pair(I, DBB)); // Loop over all of the instructions in the src basic block, copying them // over. Note that this is broken in a strict sense because the cloned @@ -323,61 +324,54 @@ static bool LinkMethodBody(Method *Dest, const Method *Src, // the remapped values. In our case, however, we will not get caught and // so we can delay patching the values up until later... // - for (BasicBlock::const_iterator II = SBB->begin(), IE = SBB->end(); + for (BasicBlock::const_iterator II = I->begin(), IE = I->end(); II != IE; ++II) { - const Instruction *SI = *II; - Instruction *DI = SI->clone(); - DI->setName(SI->getName()); + Instruction *DI = II->clone(); + DI->setName(II->getName()); DBB->getInstList().push_back(DI); - LocalMap.insert(std::make_pair(SI, DI)); + LocalMap.insert(std::make_pair(II, DI)); } } - // At this point, all of the instructions and values of the method are now - // copied over. The only problem is that they are still referencing values - // in the Source method as operands. Loop through all of the operands of the - // methods and patch them up to point to the local versions... + // At this point, all of the instructions and values of the function are now + // copied over. The only problem is that they are still referencing values in + // the Source function as operands. Loop through all of the operands of the + // functions and patch them up to point to the local versions... // - for (Method::iterator BI = Dest->begin(), BE = Dest->end(); - BI != BE; ++BI) { - BasicBlock *BB = *BI; - for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; ++I) { - Instruction *Inst = *I; - - for (Instruction::op_iterator OI = Inst->op_begin(), OE = Inst->op_end(); + for (Function::iterator BB = Dest->begin(), BE = Dest->end(); BB != BE; ++BB) + for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; ++I) + for (Instruction::op_iterator OI = I->op_begin(), OE = I->op_end(); OI != OE; ++OI) *OI = RemapOperand(*OI, LocalMap, &GlobalMap); - } - } return false; } -// LinkMethodBodies - Link in the method bodies that are defined in the source -// module into the DestModule. This consists basically of copying the method -// over and fixing up references to values. +// LinkFunctionBodies - Link in the function bodies that are defined in the +// source module into the DestModule. This consists basically of copying the +// function over and fixing up references to values. // -static bool LinkMethodBodies(Module *Dest, const Module *Src, - map &ValueMap, - string *Err = 0) { +static bool LinkFunctionBodies(Module *Dest, const Module *Src, + map &ValueMap, + string *Err = 0) { - // Loop over all of the methods in the src module, mapping them over as we go + // 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 Method *SM = *I; // Source Method - if (!SM->isExternal()) { // No body if method is external - Method *DM = cast(ValueMap[SM]); // Destination method + for (Module::const_iterator SF = Src->begin(), E = Src->end(); SF != E; ++SF){ + if (!SF->isExternal()) { // No body if function is external + Function *DF = cast(ValueMap[SF]); // Destination function - // DM not external SM external? - if (!DM->isExternal()) { + // DF not external SF external? + if (!DF->isExternal()) { if (Err) - *Err = "Method '" + (SM->hasName() ? SM->getName() : string("")) + + *Err = "Function '" + (SF->hasName() ? SF->getName() : string("")) + "' body multiply defined!"; return true; } - if (LinkMethodBody(DM, SM, ValueMap, Err)) return true; + if (LinkFunctionBody(DF, SF, ValueMap, Err)) return true; } } return false; @@ -413,18 +407,19 @@ bool LinkModules(Module *Dest, const Module *Src, string *ErrorMsg = 0) { // if (LinkGlobalInits(Dest, Src, ValueMap, ErrorMsg)) return true; - // Link the methods together between the two modules, without doing method - // bodies... this just adds external method prototypes to the Dest method... - // We do this so that when we begin processing method bodies, all of the - // global values that may be referenced are available in our ValueMap. + // Link the functions together between the two modules, without doing function + // bodies... this just adds external function prototypes to the Dest + // function... We do this so that when we begin processing function bodies, + // all of the global values that may be referenced are available in our + // ValueMap. // - if (LinkMethodProtos(Dest, Src, ValueMap, ErrorMsg)) return true; + if (LinkFunctionProtos(Dest, Src, ValueMap, ErrorMsg)) return true; - // Link in the method bodies that are defined in the source module into the - // DestModule. This consists basically of copying the method over and fixing - // up references to values. + // Link in the function bodies that are defined in the source module into the + // DestModule. This consists basically of copying the function over and + // fixing up references to values. // - if (LinkMethodBodies(Dest, Src, ValueMap, ErrorMsg)) return true; + if (LinkFunctionBodies(Dest, Src, ValueMap, ErrorMsg)) return true; return false; }