Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(436)

Unified Diff: vm/il_printer.cc

Issue 10692107: Add forward iterator to iterate instructions inside a basic block. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/runtime/
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « vm/flow_graph_builder.cc ('k') | vm/intermediate_language.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: vm/il_printer.cc
===================================================================
--- vm/il_printer.cc (revision 9435)
+++ vm/il_printer.cc (working copy)
@@ -39,17 +39,18 @@
for (intptr_t i = 0; i < block_order_.length(); ++i) {
// Print the block entry.
PrintInstruction(block_order_[i]);
- Instruction* current = block_order_[i]->successor();
// And all the successors until an exit, branch, or a block entry.
- while ((current != NULL) && !current->IsBlockEntry()) {
+ Instruction* current = block_order_[i];
+ for (ForwardInstructionIterator it(current->AsBlockEntry());
+ !it.Done();
+ it.Advance()) {
+ current = it.Current();
OS::Print("\n");
PrintInstruction(current);
- current = current->successor();
}
- BlockEntryInstr* successor =
- (current == NULL) ? NULL : current->AsBlockEntry();
- if (successor != NULL) {
- OS::Print(" goto %d", successor->block_id());
+ if (current->successor() != NULL) {
+ ASSERT(current->successor()->IsBlockEntry());
+ OS::Print(" goto %d", current->successor()->AsBlockEntry()->block_id());
}
OS::Print("\n");
}
@@ -528,19 +529,20 @@
BEGIN("HIR");
// Print the block entry.
Print("0 0 "); // Required fields "bci" and "use". Unused.
+ PrintInstruction(block_order_[i]);
+ // And all the successors until an exit, branch, or a block entry.
Instruction* current = block_order_[i];
- PrintInstruction(current);
- current = current->successor();
- // And all the successors until an exit, branch, or a block entry.
- while ((current != NULL) && !current->IsBlockEntry()) {
+ for (ForwardInstructionIterator it(current->AsBlockEntry());
+ !it.Done();
+ it.Advance()) {
+ current = it.Current();
Print("0 0 ");
PrintInstruction(current);
- current = current->successor();
}
- BlockEntryInstr* successor =
- (current == NULL) ? NULL : current->AsBlockEntry();
- if (successor != NULL) {
- Print("0 0 _ Goto B%d <|@\n", successor->block_id());
+ if (current->successor() != NULL) {
+ ASSERT(current->successor()->IsBlockEntry());
+ Print("0 0 _ Goto B%d <|@\n",
+ current->successor()->AsBlockEntry()->block_id());
}
END("HIR");
}
« no previous file with comments | « vm/flow_graph_builder.cc ('k') | vm/intermediate_language.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698