- for (Method::iterator BBI = M->begin(), BBE = M->end(); BBI != BBE; ++BBI) {
- BasicBlock *BB = *BBI;
- for (unsigned i = 0; i < BB->size(); ++i) {
- BasicBlock::InstListType &BBIL = BB->getInstList();
- if (MallocInst *MI = dyn_cast<MallocInst>(*(BBIL.begin()+i))) {
- BBIL.remove(BBIL.begin()+i); // remove the malloc instr...
-
- const Type *AllocTy =cast<PointerType>(MI->getType())->getElementType();
-
- // Get the number of bytes to be allocated for one element of the
- // requested type...
- unsigned Size = DataLayout.getTypeSize(AllocTy);
-
- // malloc(type) becomes sbyte *malloc(constint)
- Value *MallocArg = ConstantUInt::get(Type::UIntTy, Size);
- if (MI->getNumOperands() && Size == 1) {
- MallocArg = MI->getOperand(0); // Operand * 1 = Operand
- } else if (MI->getNumOperands()) {
- // Multiply it by the array size if neccesary...
- MallocArg = BinaryOperator::create(Instruction::Mul,MI->getOperand(0),
- MallocArg);
- BBIL.insert(BBIL.begin()+i++, cast<Instruction>(MallocArg));
- }
-
- // Create the call to Malloc...
- CallInst *MCall = new CallInst(MallocMeth,
- vector<Value*>(1, MallocArg));
- BBIL.insert(BBIL.begin()+i, MCall);
-
- // Create a cast instruction to convert to the right type...
- CastInst *MCast = new CastInst(MCall, MI->getType());
- BBIL.insert(BBIL.begin()+i+1, MCast);
-
- // Replace all uses of the old malloc inst with the cast inst
- MI->replaceAllUsesWith(MCast);
- delete MI; // Delete the malloc inst
- Changed = true;
- } else if (FreeInst *FI = dyn_cast<FreeInst>(*(BBIL.begin()+i))) {
- BBIL.remove(BB->getInstList().begin()+i);
-
- // Cast the argument to free into a ubyte*...
- CastInst *MCast = new CastInst(FI->getOperand(0),
- PointerType::get(Type::UByteTy));
- BBIL.insert(BBIL.begin()+i, MCast);
-
- // Insert a call to the free function...
- CallInst *FCall = new CallInst(FreeMeth,
- vector<Value*>(1, MCast));
- BBIL.insert(BBIL.begin()+i+1, FCall);
-
- // Delete the old free instruction
- delete FI;
- Changed = true;
+ for (BasicBlock::iterator I = BB.begin(), E = BB.end(); I != E; ++I) {
+ if (MallocInst *MI = dyn_cast<MallocInst>(&*I)) {
+ const Type *AllocTy = MI->getType()->getElementType();
+
+ // Get the number of bytes to be allocated for one element of the
+ // requested type...
+ unsigned Size = DataLayout.getTypeSize(AllocTy);
+
+ // malloc(type) becomes sbyte *malloc(constint)
+ Value *MallocArg = ConstantUInt::get(Type::UIntTy, Size);
+ if (MI->getNumOperands() && Size == 1) {
+ MallocArg = MI->getOperand(0); // Operand * 1 = Operand
+ } else if (MI->getNumOperands()) {
+ // Multiply it by the array size if neccesary...
+ MallocArg = BinaryOperator::create(Instruction::Mul, MI->getOperand(0),
+ MallocArg, "", I);