diff options
| author | Vladimir Marko <vmarko@google.com> | 2015-09-03 13:33:25 +0000 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2015-09-03 13:33:25 +0000 |
| commit | 145acc5361deb769eed998f057bc23abaef6e116 (patch) | |
| tree | 3d66a0b44e1ac927156eec6e6488de5fd52b982b /compiler/optimizing/dead_code_elimination.cc | |
| parent | 91e11c0c840193c6822e66846020b6647de243d5 (diff) | |
| download | art-145acc5361deb769eed998f057bc23abaef6e116.tar.gz art-145acc5361deb769eed998f057bc23abaef6e116.tar.bz2 art-145acc5361deb769eed998f057bc23abaef6e116.zip | |
Revert "Optimizing: Tag basic block allocations with their source."
Reverting so that we can have more discussion about the STL API.
This reverts commit 91e11c0c840193c6822e66846020b6647de243d5.
Change-Id: I187fe52f2c16b6e7c5c9d49c42921eb6c7063dba
Diffstat (limited to 'compiler/optimizing/dead_code_elimination.cc')
| -rw-r--r-- | compiler/optimizing/dead_code_elimination.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/compiler/optimizing/dead_code_elimination.cc b/compiler/optimizing/dead_code_elimination.cc index 509478cfad..50cbf5ca77 100644 --- a/compiler/optimizing/dead_code_elimination.cc +++ b/compiler/optimizing/dead_code_elimination.cc @@ -42,8 +42,8 @@ static void MarkReachableBlocks(HBasicBlock* block, ArenaBitVector* visited) { MarkReachableBlocks(if_instruction->IfFalseSuccessor(), visited); } } else { - for (HBasicBlock* successor : block->GetSuccessors()) { - MarkReachableBlocks(successor, visited); + for (size_t i = 0, e = block->GetSuccessors().Size(); i < e; ++i) { + MarkReachableBlocks(block->GetSuccessors().Get(i), visited); } } } @@ -99,12 +99,12 @@ void HDeadCodeElimination::RemoveDeadBlocks() { // Connect successive blocks created by dead branches. Order does not matter. for (HReversePostOrderIterator it(*graph_); !it.Done();) { HBasicBlock* block = it.Current(); - if (block->IsEntryBlock() || block->GetSuccessors().size() != 1u) { + if (block->IsEntryBlock() || block->GetSuccessors().Size() != 1u) { it.Advance(); continue; } - HBasicBlock* successor = block->GetSuccessor(0); - if (successor->IsExitBlock() || successor->GetPredecessors().size() != 1u) { + HBasicBlock* successor = block->GetSuccessors().Get(0); + if (successor->IsExitBlock() || successor->GetPredecessors().Size() != 1u) { it.Advance(); continue; } |
