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/ExecutionEngine/Interpreter/Execution.cpp b/lib/ExecutionEngine/Interpreter/Execution.cpp
index 0fad829..9f6317f 100644
--- a/lib/ExecutionEngine/Interpreter/Execution.cpp
+++ b/lib/ExecutionEngine/Interpreter/Execution.cpp
@@ -1034,10 +1034,12 @@
// Iterate over all of the instructions...
unsigned InstNum = 0;
- for (Method::inst_iterator MI = M->inst_begin(), ME = M->inst_end();
- MI != ME; ++MI) {
- Instruction *I = *MI; // For each instruction...
- I->addAnnotation(new InstNumber(++InstNum, getValueSlot(I))); // Add Annote
+ for (Method::iterator MI = M->begin(), ME = M->end(); MI != ME; ++MI) {
+ BasicBlock *BB = *MI;
+ for (BasicBlock::iterator II = BB->begin(), IE = BB->end(); II != IE; ++II){
+ Instruction *I = *II; // For each instruction... Add Annote
+ I->addAnnotation(new InstNumber(++InstNum, getValueSlot(I)));
+ }
}
}
diff --git a/lib/ExecutionEngine/Interpreter/Interpreter.h b/lib/ExecutionEngine/Interpreter/Interpreter.h
index ffe1001..050b7d3 100644
--- a/lib/ExecutionEngine/Interpreter/Interpreter.h
+++ b/lib/ExecutionEngine/Interpreter/Interpreter.h
@@ -13,6 +13,7 @@
#include "llvm/Module.h"
#include "llvm/Method.h"
+#include "llvm/BasicBlock.h"
#include "Support/DataTypes.h"
#include "llvm/Assembly/CachedWriter.h"