From 622bdbe6c295b08d06dfaa8d896b9ca152aa899c Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Thu, 19 Jun 2014 14:59:05 +0100 Subject: Fix topological ordering and use it for optimizations. Use the topological sort order for ClassInitCheckElimination and NullCheckEliminationAndTypeInference. Change-Id: I315ca7f300dd11390f48aefebfe988baf91bdcf1 --- compiler/dex/dataflow_iterator.h | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'compiler/dex/dataflow_iterator.h') diff --git a/compiler/dex/dataflow_iterator.h b/compiler/dex/dataflow_iterator.h index 62973afc38..66c524fc98 100644 --- a/compiler/dex/dataflow_iterator.h +++ b/compiler/dex/dataflow_iterator.h @@ -337,16 +337,10 @@ namespace art { * @param mir_graph The MIRGraph considered. */ explicit TopologicalSortIterator(MIRGraph* mir_graph) - : DataflowIterator(mir_graph, 0, mir_graph->GetTopologicalSortOrder() != nullptr ? - mir_graph->GetTopologicalSortOrder()->Size() : 0) { + : DataflowIterator(mir_graph, 0, mir_graph->GetTopologicalSortOrder()->Size()) { // Extra setup for TopologicalSortIterator. idx_ = start_idx_; block_id_list_ = mir_graph->GetTopologicalSortOrder(); - - if (mir_graph->GetTopologicalSortOrder() == nullptr) { - /* Compute the topological order */ - mir_graph->ComputeTopologicalSortOrder(); - } } /** @@ -375,16 +369,10 @@ namespace art { * @param mir_graph The MIRGraph considered. */ explicit RepeatingTopologicalSortIterator(MIRGraph* mir_graph) - : DataflowIterator(mir_graph, 0, mir_graph->GetTopologicalSortOrder() != nullptr ? - mir_graph->GetTopologicalSortOrder()->Size() : 0) { + : DataflowIterator(mir_graph, 0, mir_graph->GetTopologicalSortOrder()->Size()) { // Extra setup for RepeatingTopologicalSortIterator. idx_ = start_idx_; block_id_list_ = mir_graph->GetTopologicalSortOrder(); - - if (mir_graph->GetTopologicalSortOrder() == nullptr) { - /* Compute the topological order */ - mir_graph->ComputeTopologicalSortOrder(); - } } /** -- cgit v1.2.3-59-g8ed1b