for (BasicBlock::iterator BI = BB->begin(); BI != BB->end();) {
DEBUG(cerr << "Processing: " << *BI);
- if (dceInstruction(BIL, BI) || doConstantPropogation(BB, BI)) {
+ if (dceInstruction(BI) || doConstantPropogation(BI)) {
Changed = true;
++NumDCEorCP;
DEBUG(cerr << "***\t\t^^-- DeadCode Elinated!\n");
BasicBlock::InstListType &Vals = BB->getInstList();
bool Changed = false;
for (BasicBlock::iterator DI = Vals.begin(); DI != Vals.end(); )
- if (dceInstruction(Vals, DI)) {
+ if (dceInstruction(DI)) {
Changed = true;
++DIEEliminated;
} else
// ConstantFoldInstruction - If an instruction references constants, try to fold
// them together...
//
-bool doConstantPropogation(BasicBlock *BB, BasicBlock::iterator &II) {
+bool doConstantPropogation(BasicBlock::iterator &II) {
Instruction *Inst = *II;
if (Constant *C = ConstantFoldInstruction(Inst)) {
// Replaces all of the uses of a variable with uses of the constant.
Inst->replaceAllUsesWith(C);
// Remove the instruction from the basic block...
- delete BB->getInstList().remove(II);
+ delete Inst->getParent()->getInstList().remove(II);
return true;
}
// to point to the instruction that immediately succeeded the original
// instruction.
//
-bool dceInstruction(BasicBlock::InstListType &BBIL,
- BasicBlock::iterator &BBI) {
+bool dceInstruction(BasicBlock::iterator &BBI) {
// Look for un"used" definitions...
- if (isInstructionTriviallyDead(*BBI)) {
- delete BBIL.remove(BBI); // Bye bye
+ Instruction *I = *BBI;
+ if (isInstructionTriviallyDead(I)) {
+ delete I->getParent()->getInstList().remove(BBI); // Bye bye
return true;
}
return false;