Method.h no longer includes BasicBlock.h
Method::inst_* is now in llvm/Support/InstIterator.h
GraphTraits specializations for BasicBlock and Methods are now in llvm/Support/CFG.h
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@1746 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Transforms/Scalar/ADCE.cpp b/lib/Transforms/Scalar/ADCE.cpp
index 71c5067..7f71cf1 100644
--- a/lib/Transforms/Scalar/ADCE.cpp
+++ b/lib/Transforms/Scalar/ADCE.cpp
@@ -13,6 +13,7 @@
#include "llvm/Analysis/Writer.h"
#include "llvm/iTerminators.h"
#include "llvm/iPHINode.h"
+#include "llvm/Support/CFG.h"
#include "Support/STLExtras.h"
#include "Support/DepthFirstIterator.h"
#include <algorithm>
@@ -156,10 +157,12 @@
#ifdef DEBUG_ADCE
cerr << "Current Method: X = Live\n";
- for (Method::inst_iterator IL = M->inst_begin(); IL != M->inst_end(); ++IL) {
- if (LiveSet.count(*IL)) cerr << "X ";
- cerr << *IL;
- }
+ for (Method::iterator I = M->begin(), E = M->end(); I != E; ++I)
+ for (BasicBlock::iterator BI = (*I)->begin(), BE = (*I)->end();
+ BI != BE; ++BI) {
+ if (LiveSet.count(*BI)) cerr << "X ";
+ cerr << *BI;
+ }
#endif
// After the worklist is processed, recursively walk the CFG in depth first
diff --git a/lib/Transforms/Scalar/IndVarSimplify.cpp b/lib/Transforms/Scalar/IndVarSimplify.cpp
index d06c197..59442ea 100644
--- a/lib/Transforms/Scalar/IndVarSimplify.cpp
+++ b/lib/Transforms/Scalar/IndVarSimplify.cpp
@@ -11,6 +11,7 @@
#include "llvm/iPHINode.h"
#include "llvm/iOther.h"
#include "llvm/Type.h"
+#include "llvm/BasicBlock.h"
#include "llvm/ConstantVals.h"
#include "Support/STLExtras.h"
diff --git a/lib/Transforms/Scalar/InductionVars.cpp b/lib/Transforms/Scalar/InductionVars.cpp
index 48982f4..bc130f0 100644
--- a/lib/Transforms/Scalar/InductionVars.cpp
+++ b/lib/Transforms/Scalar/InductionVars.cpp
@@ -26,6 +26,7 @@
#include "llvm/SymbolTable.h"
#include "llvm/iPHINode.h"
#include "llvm/Method.h"
+#include "llvm/BasicBlock.h"
#include "Support/STLExtras.h"
#include <algorithm>
#include <iostream>
diff --git a/lib/Transforms/Scalar/InstructionCombining.cpp b/lib/Transforms/Scalar/InstructionCombining.cpp
index 2559066..962ca97 100644
--- a/lib/Transforms/Scalar/InstructionCombining.cpp
+++ b/lib/Transforms/Scalar/InstructionCombining.cpp
@@ -18,6 +18,7 @@
#include "llvm/Transforms/Scalar/ConstantHandling.h"
#include "llvm/Method.h"
#include "llvm/iMemory.h"
+#include "llvm/Support/InstIterator.h"
#include "../TransformInternals.h"
static Instruction *CombineBinOp(BinaryOperator *I) {
@@ -126,7 +127,7 @@
bool InstructionCombining::doit(Method *M) {
// Start the worklist out with all of the instructions in the method in it.
- std::vector<Instruction*> WorkList(M->inst_begin(), M->inst_end());
+ std::vector<Instruction*> WorkList(inst_begin(M), inst_end(M));
while (!WorkList.empty()) {
Instruction *I = WorkList.back(); // Get an instruction from the worklist
diff --git a/lib/Transforms/Scalar/SCCP.cpp b/lib/Transforms/Scalar/SCCP.cpp
index d6b7c40..ada670d 100644
--- a/lib/Transforms/Scalar/SCCP.cpp
+++ b/lib/Transforms/Scalar/SCCP.cpp
@@ -244,39 +244,36 @@
// constants if we have found them to be of constant values.
//
bool MadeChanges = false;
- for (Method::inst_iterator II = M->inst_begin(); II != M->inst_end(); ) {
- Instruction *Inst = *II;
- InstVal &IV = ValueState[Inst];
- if (IV.isConstant()) {
- Constant *Const = IV.getConstant();
- // cerr << "Constant: " << Inst << " is: " << Const;
+ for (Method::iterator MI = M->begin(), ME = M->end(); MI != ME; ++MI) {
+ BasicBlock *BB = *MI;
+ for (BasicBlock::iterator BI = BB->begin(); BI != BB->end();) {
+ Instruction *Inst = *BI;
+ InstVal &IV = ValueState[Inst];
+ if (IV.isConstant()) {
+ Constant *Const = IV.getConstant();
+ // cerr << "Constant: " << Inst << " is: " << Const;
- // Replaces all of the uses of a variable with uses of the constant.
- Inst->replaceAllUsesWith(Const);
+ // Replaces all of the uses of a variable with uses of the constant.
+ Inst->replaceAllUsesWith(Const);
- // Remove the operator from the list of definitions...
- Inst->getParent()->getInstList().remove(II.getInstructionIterator());
+ // Remove the operator from the list of definitions...
+ BB->getInstList().remove(BI);
- // The new constant inherits the old name of the operator...
- if (Inst->hasName() && !Const->hasName())
- Const->setName(Inst->getName(), M->getSymbolTableSure());
+ // The new constant inherits the old name of the operator...
+ if (Inst->hasName() && !Const->hasName())
+ Const->setName(Inst->getName(), M->getSymbolTableSure());
- // Delete the operator now...
- delete Inst;
+ // Delete the operator now...
+ delete Inst;
- // Incrementing the iterator in an unchecked manner could mess up the
- // internals of 'II'. To make sure everything is happy, tell it we might
- // have broken it.
- II.resyncInstructionIterator();
+ // Hey, we just changed something!
+ MadeChanges = true;
+ } else if (TerminatorInst *TI = dyn_cast<TerminatorInst>(Inst)) {
+ MadeChanges |= ConstantFoldTerminator(TI);
+ }
- // Hey, we just changed something!
- MadeChanges = true;
- continue; // Skip the ++II at the end of the loop here...
- } else if (Inst->isTerminator()) {
- MadeChanges |= ConstantFoldTerminator(cast<TerminatorInst>(Inst));
+ ++BI;
}
-
- ++II;
}
// Merge identical constants last: this is important because we may have just
diff --git a/lib/Transforms/Utils/Linker.cpp b/lib/Transforms/Utils/Linker.cpp
index e162252..f265bb0 100644
--- a/lib/Transforms/Utils/Linker.cpp
+++ b/lib/Transforms/Utils/Linker.cpp
@@ -12,6 +12,7 @@
#include "llvm/Transforms/Linker.h"
#include "llvm/Module.h"
#include "llvm/Method.h"
+#include "llvm/BasicBlock.h"
#include "llvm/GlobalVariable.h"
#include "llvm/SymbolTable.h"
#include "llvm/DerivedTypes.h"
@@ -337,13 +338,16 @@
// 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 (Method::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;