X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FTransforms%2FUtils%2FLinker.cpp;h=086c6c6b28f062fc4b897297a6f37989ac20cbfb;hb=b9ddce65c281f023780d2b6578e7ed6d2913a2cb;hp=8be0793baca83148976413b0c4cfcc5aafb24ec8;hpb=e4d25aad16bfc2a26595f6255fc2bfdaa6c532a7;p=oota-llvm.git diff --git a/lib/Transforms/Utils/Linker.cpp b/lib/Transforms/Utils/Linker.cpp index 8be0793baca..086c6c6b28f 100644 --- a/lib/Transforms/Utils/Linker.cpp +++ b/lib/Transforms/Utils/Linker.cpp @@ -11,12 +11,18 @@ #include "llvm/Transforms/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/ConstPoolVals.h" +#include "llvm/ConstantVals.h" +#include "llvm/Argument.h" +#include +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... @@ -26,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. @@ -56,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 @@ -69,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 << endl; + cerr << " Fr: " << (void*)I->first << " "; + I->first->dump(); + cerr << " To: " << (void*)I->second << " "; + I->second->dump(); + cerr << "\n"; } } @@ -90,37 +96,37 @@ static Value *RemapOperand(const Value *In, map &LocalMap, } // Check to see if it's a constant that we are interesting in transforming... - if (ConstPoolVal *CPV = dyn_cast(In)) { + if (Constant *CPV = dyn_cast(In)) { if (!isa(CPV->getType())) return CPV; // Simple constants stay identical... - ConstPoolVal *Result = 0; + Constant *Result = 0; - if (ConstPoolArray *CPA = dyn_cast(CPV)) { - const vector &Ops = CPA->getValues(); - vector Operands(Ops.size()); + if (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 = ConstPoolArray::get(cast(CPA->getType()), Operands); - } else if (ConstPoolStruct *CPS = dyn_cast(CPV)) { - const vector &Ops = CPS->getValues(); - vector Operands(Ops.size()); + cast(RemapOperand(Ops[i], LocalMap, GlobalMap)); + Result = ConstantArray::get(cast(CPA->getType()), Operands); + } else if (ConstantStruct *CPS = dyn_cast(CPV)) { + const std::vector &Ops = CPS->getValues(); + std::vector Operands(Ops.size()); for (unsigned i = 0; i < Ops.size(); ++i) Operands[i] = - cast(RemapOperand(Ops[i], LocalMap, GlobalMap)); - Result = ConstPoolStruct::get(cast(CPS->getType()), Operands); - } else if (isa(CPV)) { + cast(RemapOperand(Ops[i], LocalMap, GlobalMap)); + Result = ConstantStruct::get(cast(CPS->getType()), Operands); + } else if (isa(CPV)) { Result = CPV; - } else if (ConstPoolPointerRef *CPR = dyn_cast(CPV)) { + } else if (ConstantPointerRef *CPR = dyn_cast(CPV)) { Value *V = RemapOperand(CPR->getValue(), LocalMap, GlobalMap); - Result = ConstPoolPointerRef::get(cast(V)); + Result = ConstantPointerRef::get(cast(V)); } else { assert(0 && "Unknown type of derived type constant value!"); } // Cache the mapping in our local map structure... - LocalMap.insert(make_pair(In, CPV)); + LocalMap.insert(std::make_pair(In, CPV)); return Result; } @@ -132,7 +138,9 @@ static Value *RemapOperand(const Value *In, map &LocalMap, PrintMap(*GlobalMap); } - cerr << "Couldn't remap value: " << (void*)In << " " << In << endl; + cerr << "Couldn't remap value: " << (void*)In << " "; + In->dump(); + cerr << "\n"; assert(0 && "Couldn't remap value!"); return 0; } @@ -160,8 +168,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); @@ -172,21 +180,21 @@ static bool LinkGlobals(Module *Dest, const Module *Src, " - Global variables differ in const'ness"); // Okay, everything is cool, remember the mapping... - ValueMap.insert(make_pair(SGV, DGV)); + ValueMap.insert(std::make_pair(SGV, DGV)); } else { // 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()->getValueType(), SGV->isConstant(), + 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); // Make sure to remember this mapping... - ValueMap.insert(make_pair(SGV, DGV)); + ValueMap.insert(std::make_pair(SGV, DGV)); } } return false; @@ -207,8 +215,8 @@ 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... - ConstPoolVal *DInit = - cast(RemapOperand(SGV->getInitializer(), ValueMap)); + Constant *DInit = + cast(RemapOperand(SGV->getInitializer(), ValueMap)); GlobalVariable *DGV = cast(ValueMap[SGV]); if (DGV->hasInitializer() && SGV->hasExternalLinkage() && @@ -226,13 +234,13 @@ 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 method bodies... this just adds external method 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; @@ -240,7 +248,7 @@ static bool LinkMethodProtos(Module *Dest, const Module *Src, // Loop over all of the methods 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 *SM = *I; // SrcFunction Value *V; // If the method has a name, and that name is already in use in the @@ -248,69 +256,70 @@ static bool LinkMethodProtos(Module *Dest, const Module *Src, // 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. + 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 *DM = 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!"); + return Error(Err, "Function '" + + SM->getFunctionType()->getDescription() + "':\"" + + SM->getName() + "\" - Function is already defined!"); // Otherwise, just remember this mapping... - ValueMap.insert(make_pair(SM, DM)); + ValueMap.insert(std::make_pair(SM, DM)); } else { - // Method does not already exist, simply insert an external method + // Function 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 *DM = new Function(SM->getFunctionType(), + SM->hasInternalLinkage(), + SM->getName()); // Add the method signature to the dest module... - Dest->getMethodList().push_back(DM); + Dest->getFunctionList().push_back(DM); // ... and remember this mapping... - ValueMap.insert(make_pair(SM, DM)); + ValueMap.insert(std::make_pair(SM, DM)); } } 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 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. // -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 + for (Function::ArgumentListType::const_iterator I = Src->getArgumentList().begin(), E = Src->getArgumentList().end(); I != E; ++I) { - const MethodArgument *SMA = *I; + const Argument *SMA = *I; // Create the new method argument and add to the dest method... - MethodArgument *DMA = new MethodArgument(SMA->getType(), SMA->getName()); + Argument *DMA = new Argument(SMA->getType(), SMA->getName()); Dest->getArgumentList().push_back(DMA); // Add a mapping to our local map - LocalMap.insert(make_pair(SMA, DMA)); + LocalMap.insert(std::make_pair(SMA, DMA)); } // Loop over all of the basic blocks, copying the instructions over... // - for (Method::const_iterator I = Src->begin(), E = Src->end(); I != E; ++I) { + for (Function::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(make_pair(SBB, DBB)); + LocalMap.insert(std::make_pair(SBB, 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 @@ -324,7 +333,7 @@ static bool LinkMethodBody(Method *Dest, const Method *Src, Instruction *DI = SI->clone(); DI->setName(SI->getName()); DBB->getInstList().push_back(DI); - LocalMap.insert(make_pair(SI, DI)); + LocalMap.insert(std::make_pair(SI, DI)); } } @@ -333,43 +342,46 @@ static bool LinkMethodBody(Method *Dest, const Method *Src, // 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... // - for (Method::inst_iterator I = Dest->inst_begin(), E = Dest->inst_end(); - I != E; ++I) { - Instruction *Inst = *I; - - for (Instruction::op_iterator OI = Inst->op_begin(), OE = Inst->op_end(); - OI != OE; ++OI) - *OI = RemapOperand(*OI, LocalMap, &GlobalMap); + for (Function::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(); + OI != OE; ++OI) + *OI = RemapOperand(*OI, LocalMap, &GlobalMap); + } } return false; } -// LinkMethodBodies - Link in the method bodies that are defined in the source +// LinkFunctionBodies - 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. // -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 // for (Module::const_iterator I = Src->begin(), E = Src->end(); I != E; ++I) { - const Method *SM = *I; // Source Method + const Function *SM = *I; // Source Function if (!SM->isExternal()) { // No body if method is external - Method *DM = cast(ValueMap[SM]); // Destination method + Function *DM = cast(ValueMap[SM]); // Destination method // DM not external SM external? if (!DM->isExternal()) { if (Err) - *Err = "Method '" + (SM->hasName() ? SM->getName() : string("")) + + *Err = "Function '" + (SM->hasName() ? SM->getName() : string("")) + "' body multiply defined!"; return true; } - if (LinkMethodBody(DM, SM, ValueMap, Err)) return true; + if (LinkFunctionBody(DM, SM, ValueMap, Err)) return true; } } return false; @@ -410,13 +422,13 @@ bool LinkModules(Module *Dest, const Module *Src, string *ErrorMsg = 0) { // 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. // - 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. // - if (LinkMethodBodies(Dest, Src, ValueMap, ErrorMsg)) return true; + if (LinkFunctionBodies(Dest, Src, ValueMap, ErrorMsg)) return true; return false; }