From 69f08baaa4b70ce32a258f3da43cf12f2a034696 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Fri, 11 Apr 2014 12:28:11 +0100 Subject: Clean up ScopedArenaAllocatorAdapter. Make the adapter equality-comparable, define aliases for containers using the adapter and use those aliases. Fix DebugStackIndirectTopRefImpl assignment. Change-Id: I689aa8a93d169f63a659dec5040567d7b1343277 --- compiler/dex/mir_optimization.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'compiler/dex/mir_optimization.cc') diff --git a/compiler/dex/mir_optimization.cc b/compiler/dex/mir_optimization.cc index 413b4e0f75..8e8a593192 100644 --- a/compiler/dex/mir_optimization.cc +++ b/compiler/dex/mir_optimization.cc @@ -19,6 +19,7 @@ #include "dataflow_iterator-inl.h" #include "dex/quick/dex_file_method_inliner.h" #include "dex/quick/dex_file_to_method_inliner_map.h" +#include "utils/scoped_arena_containers.h" namespace art { @@ -964,11 +965,9 @@ bool MIRGraph::EliminateClassInitChecksGate() { } }; - typedef std::set > - ClassToIndexMap; - ScopedArenaAllocator allocator(&cu_->arena_stack); - ClassToIndexMap class_to_index_map(MapEntryComparator(), allocator.Adapter()); + ScopedArenaSet class_to_index_map(MapEntryComparator(), + allocator.Adapter()); // First, find all SGET/SPUTs that may need class initialization checks, record INVOKE_STATICs. AllNodesIterator iter(this); -- cgit v1.2.3-59-g8ed1b