Minor changes to cloning interface
llvm-svn: 4770
diff --git a/llvm/lib/Transforms/IPO/InlineSimple.cpp b/llvm/lib/Transforms/IPO/InlineSimple.cpp
index b4542ea..6dbab59 100644
--- a/llvm/lib/Transforms/IPO/InlineSimple.cpp
+++ b/llvm/lib/Transforms/IPO/InlineSimple.cpp
@@ -90,9 +90,14 @@
Function::iterator LastBlock = &OrigBB->getParent()->back();
// Calculate the vector of arguments to pass into the function cloner...
- std::vector<Value*> ArgVector;
- for (unsigned i = 1, e = CI->getNumOperands(); i != e; ++i)
- ArgVector.push_back(CI->getOperand(i));
+ std::map<const Value*, Value*> ValueMap;
+ assert((unsigned)std::distance(CalledFunc->abegin(), CalledFunc->aend()) ==
+ CI->getNumOperands()-1 && "No varargs calls can be inlined yet!");
+
+ unsigned i = 1;
+ for (Function::const_aiterator I = CalledFunc->abegin(), E=CalledFunc->aend();
+ I != E; ++I, ++i)
+ ValueMap[I] = CI->getOperand(i);
// Since we are now done with the CallInst, we can delete it.
delete CI;
@@ -101,7 +106,7 @@
std::vector<ReturnInst*> Returns;
// Do all of the hard part of cloning the callee into the caller...
- CloneFunctionInto(OrigBB->getParent(), CalledFunc, ArgVector, Returns, ".i");
+ CloneFunctionInto(OrigBB->getParent(), CalledFunc, ValueMap, Returns, ".i");
// Loop over all of the return instructions, turning them into unconditional
// branches to the merge point now...
diff --git a/llvm/lib/Transforms/Utils/CloneFunction.cpp b/llvm/lib/Transforms/Utils/CloneFunction.cpp
index 442ff03..36b3a7e 100644
--- a/llvm/lib/Transforms/Utils/CloneFunction.cpp
+++ b/llvm/lib/Transforms/Utils/CloneFunction.cpp
@@ -37,25 +37,16 @@
// ArgMap values.
//
void CloneFunctionInto(Function *NewFunc, const Function *OldFunc,
- const std::vector<Value*> &ArgMap,
+ std::map<const Value*, Value*> &ValueMap,
std::vector<ReturnInst*> &Returns,
const char *NameSuffix) {
assert(NameSuffix && "NameSuffix cannot be null!");
- assert(OldFunc->asize() == ArgMap.size() &&
- "Improper number of argument values to map specified!");
- // Keep a mapping between the original function's values and the new
- // duplicated code's values. This includes all of: Function arguments,
- // instruction values, constant pool entries, and basic blocks.
- //
- std::map<const Value *, Value*> ValueMap;
-
- // Add all of the function arguments to the mapping...
- unsigned i = 0;
+#ifndef NDEBUG
for (Function::const_aiterator I = OldFunc->abegin(), E = OldFunc->aend();
- I != E; ++I, ++i)
- ValueMap[I] = ArgMap[i];
-
+ I != E; ++I)
+ assert(ValueMap.count(I) && "No mapping from source argument specified!");
+#endif
// Loop over all of the basic blocks in the function, cloning them as
// appropriate. Note that we save BE this way in order to handle cloning of