diff options
author | 2017-10-12 09:05:08 +0000 | |
---|---|---|
committer | 2017-10-12 09:05:08 +0000 | |
commit | 0284f43d625f0776ee0586a7cc321e11f5405e8c (patch) | |
tree | 983c86ff79f2a5a089bfa44ec27a5f2c5d6206b6 /compiler/optimizing/scheduler.h | |
parent | 128acd4b5b34cdd51328de03df085deaa040b864 (diff) | |
parent | 52d52f5dc3e005829926e68c656fb27e8b008ae9 (diff) |
Merge changes I4bbb21bf,Ie79b46cd,Ia50aafc8
* changes:
Use ScopedArenaAllocator in GVN.
Use ScopedArenaAllocator for Phi elimination pass.
Use ScopedArenaAllocator for building HGraph.
Diffstat (limited to 'compiler/optimizing/scheduler.h')
-rw-r--r-- | compiler/optimizing/scheduler.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/optimizing/scheduler.h b/compiler/optimizing/scheduler.h index 3efd26af9b..afdf6f1474 100644 --- a/compiler/optimizing/scheduler.h +++ b/compiler/optimizing/scheduler.h @@ -253,14 +253,14 @@ class SchedulingGraph : public ValueObject { public: SchedulingGraph(const HScheduler* scheduler, ScopedArenaAllocator* allocator) : scheduler_(scheduler), - arena_(allocator), + allocator_(allocator), contains_scheduling_barrier_(false), - nodes_map_(arena_->Adapter(kArenaAllocScheduler)), + nodes_map_(allocator_->Adapter(kArenaAllocScheduler)), heap_location_collector_(nullptr) {} SchedulingNode* AddNode(HInstruction* instr, bool is_scheduling_barrier = false) { std::unique_ptr<SchedulingNode> node( - new (arena_) SchedulingNode(instr, arena_, is_scheduling_barrier)); + new (allocator_) SchedulingNode(instr, allocator_, is_scheduling_barrier)); SchedulingNode* result = node.get(); nodes_map_.Insert(std::make_pair(instr, std::move(node))); contains_scheduling_barrier_ |= is_scheduling_barrier; @@ -323,7 +323,7 @@ class SchedulingGraph : public ValueObject { const HScheduler* const scheduler_; - ScopedArenaAllocator* const arena_; + ScopedArenaAllocator* const allocator_; bool contains_scheduling_barrier_; |