diff options
| author | Vladimir Marko <vmarko@google.com> | 2015-10-01 20:57:57 +0100 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2015-10-08 11:10:18 +0100 |
| commit | ec7802a102d49ab5c17495118d4fe0bcc7287beb (patch) | |
| tree | 08649609604b9c96bc48ca071c48b0af5abb1a3f /compiler/optimizing/dead_code_elimination.cc | |
| parent | b2e436ffcda1d7a87e7bf9133d8ed878388c73c2 (diff) | |
| download | art-ec7802a102d49ab5c17495118d4fe0bcc7287beb.tar.gz art-ec7802a102d49ab5c17495118d4fe0bcc7287beb.tar.bz2 art-ec7802a102d49ab5c17495118d4fe0bcc7287beb.zip | |
Add DCHECKs to ArenaVector and ScopedArenaVector.
Implement dchecked_vector<> template that DCHECK()s element
access and insert()/emplace()/erase() positions. Change the
ArenaVector<> and ScopedArenaVector<> aliases to use the new
template instead of std::vector<>. Remove DCHECK()s that
have now become unnecessary from the Optimizing compiler.
Change-Id: Ib8506bd30d223f68f52bd4476c76d9991acacadc
Diffstat (limited to 'compiler/optimizing/dead_code_elimination.cc')
| -rw-r--r-- | compiler/optimizing/dead_code_elimination.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/optimizing/dead_code_elimination.cc b/compiler/optimizing/dead_code_elimination.cc index 007d0e3332..9754043f32 100644 --- a/compiler/optimizing/dead_code_elimination.cc +++ b/compiler/optimizing/dead_code_elimination.cc @@ -63,7 +63,7 @@ static void MarkReachableBlocks(HGraph* graph, ArenaBitVector* visited) { static_cast<uint32_t>(switch_value) - static_cast<uint32_t>(start_value); if (switch_index < switch_instruction->GetNumEntries()) { live_successors = live_successors.SubArray(switch_index, 1u); - DCHECK_EQ(live_successors[0], block->GetSuccessor(switch_index)); + DCHECK_EQ(live_successors[0], block->GetSuccessors()[switch_index]); } else { live_successors = live_successors.SubArray(switch_instruction->GetNumEntries(), 1u); DCHECK_EQ(live_successors[0], switch_instruction->GetDefaultBlock()); @@ -136,7 +136,7 @@ void HDeadCodeElimination::RemoveDeadBlocks() { it.Advance(); continue; } - HBasicBlock* successor = block->GetSuccessor(0); + HBasicBlock* successor = block->GetSuccessors()[0]; if (successor->IsExitBlock() || successor->GetPredecessors().size() != 1u) { it.Advance(); continue; |