diff options
author | 2017-10-09 12:58:04 +0000 | |
---|---|---|
committer | 2017-10-09 12:58:04 +0000 | |
commit | 0967cd94860178a5809a9678d005b18c20c24707 (patch) | |
tree | f9e0c97fc7efbdbd8236b1f280227f1c9457d089 /compiler/optimizing/optimizing_unit_test.h | |
parent | 464f8cd7385a9958c3171e2feaa93c726043bbf8 (diff) | |
parent | e764d2e50c544c2cb98ee61a15d613161ac6bd17 (diff) |
Merge "Use ScopedArenaAllocator for register allocation."
Diffstat (limited to 'compiler/optimizing/optimizing_unit_test.h')
-rw-r--r-- | compiler/optimizing/optimizing_unit_test.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/compiler/optimizing/optimizing_unit_test.h b/compiler/optimizing/optimizing_unit_test.h index f31ad828eb..5632f9a453 100644 --- a/compiler/optimizing/optimizing_unit_test.h +++ b/compiler/optimizing/optimizing_unit_test.h @@ -48,7 +48,7 @@ namespace art { LiveInterval* BuildInterval(const size_t ranges[][2], size_t number_of_ranges, - ArenaAllocator* allocator, + ScopedArenaAllocator* allocator, int reg = -1, HInstruction* defined_by = nullptr) { LiveInterval* interval = @@ -81,15 +81,18 @@ void RemoveSuspendChecks(HGraph* graph) { class ArenaPoolAndAllocator { public: - ArenaPoolAndAllocator() : pool_(), allocator_(&pool_), arena_stack_(&pool_) { } + ArenaPoolAndAllocator() + : pool_(), allocator_(&pool_), arena_stack_(&pool_), scoped_allocator_(&arena_stack_) { } ArenaAllocator* GetAllocator() { return &allocator_; } ArenaStack* GetArenaStack() { return &arena_stack_; } + ScopedArenaAllocator* GetScopedAllocator() { return &scoped_allocator_; } private: ArenaPool pool_; ArenaAllocator allocator_; ArenaStack arena_stack_; + ScopedArenaAllocator scoped_allocator_; }; inline HGraph* CreateGraph(ArenaPoolAndAllocator* pool_and_allocator) { @@ -107,6 +110,7 @@ class OptimizingUnitTest : public CommonCompilerTest { ArenaAllocator* GetAllocator() { return pool_and_allocator_->GetAllocator(); } ArenaStack* GetArenaStack() { return pool_and_allocator_->GetArenaStack(); } + ScopedArenaAllocator* GetScopedAllocator() { return pool_and_allocator_->GetScopedAllocator(); } void ResetPoolAndAllocator() { pool_and_allocator_.reset(new ArenaPoolAndAllocator()); |