diff options
Diffstat (limited to 'lib/Transforms')
| -rw-r--r-- | lib/Transforms/IPO/MutateStructTypes.cpp | 8 | ||||
| -rw-r--r-- | lib/Transforms/Utils/Linker.cpp | 9 |
2 files changed, 8 insertions, 9 deletions
diff --git a/lib/Transforms/IPO/MutateStructTypes.cpp b/lib/Transforms/IPO/MutateStructTypes.cpp index 7f62f2b50e..483fba5678 100644 --- a/lib/Transforms/IPO/MutateStructTypes.cpp +++ b/lib/Transforms/IPO/MutateStructTypes.cpp @@ -317,10 +317,10 @@ void MutateStructTypes::transformFunction(Function *m) { Function *NewMeth = cast<Function>(GMI->second); // Okay, first order of business, create the arguments... - for (Function::aiterator I = m->abegin(), E = m->aend(); I != E; ++I) { - Argument *NFA = new Argument(ConvertType(I->getType()), I->getName()); - NewMeth->getArgumentList().push_back(NFA); - LocalValueMap[I] = NFA; // Keep track of value mapping + for (Function::aiterator I = m->abegin(), E = m->aend(), + DI = NewMeth->abegin(); I != E; ++I, ++DI) { + DI->setName(I->getName()); + LocalValueMap[I] = DI; // Keep track of value mapping } diff --git a/lib/Transforms/Utils/Linker.cpp b/lib/Transforms/Utils/Linker.cpp index 6753f51657..8fe9113d82 100644 --- a/lib/Transforms/Utils/Linker.cpp +++ b/lib/Transforms/Utils/Linker.cpp @@ -323,14 +323,13 @@ static bool LinkFunctionBody(Function *Dest, const Function *Src, map<const Value*, Value*> LocalMap; // Map for function local values // Go through and convert function arguments over... + Function::aiterator DI = Dest->abegin(); 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); + I != E; ++I, ++DI) { + DI->setName(I->getName()); // Copy the name information over... // Add a mapping to our local map - LocalMap.insert(std::make_pair(I, DFA)); + LocalMap.insert(std::make_pair(I, DI)); } // Loop over all of the basic blocks, copying the instructions over... |