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/CodeGen/InstrSelection/InstrForest.cpp b/lib/CodeGen/InstrSelection/InstrForest.cpp
index 29090e0..b11d71e 100644
--- a/lib/CodeGen/InstrSelection/InstrForest.cpp
+++ b/lib/CodeGen/InstrSelection/InstrForest.cpp
@@ -189,15 +189,18 @@
InstrForest::InstrForest(Method *M)
{
- for (Method::inst_iterator I = M->inst_begin(); I != M->inst_end(); ++I)
- this->buildTreeForInstruction(*I);
+ for (Method::iterator MI = M->begin(), ME = M->end(); MI != ME; ++MI) {
+ BasicBlock *BB = *MI;
+ for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; ++I)
+ buildTreeForInstruction(*I);
+ }
}
InstrForest::~InstrForest()
{
for (std::hash_map<const Instruction*,InstructionNode*>::iterator I = begin();
I != end(); ++I)
- delete (*I).second;
+ delete I->second;
}
void