Version 5.6.1.1 (cherry-pick)

src/compiler/zone-pool.cc

Index: src/compiler/zone-pool.cc
diff --git a/src/compiler/zone-stats.cc b/src/compiler/zone-pool.cc
similarity index 52%
rename from src/compiler/zone-stats.cc
rename to src/compiler/zone-pool.cc
index 62241a494690f453e043b4d02a4435dc1aded83a..7681eeb5d17dbc831b96372cddf438cdd0d6906e 100644
--- a/src/compiler/zone-stats.cc
+++ b/src/compiler/zone-pool.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/compiler/zone-stats.h"
+#include "src/compiler/zone-pool.h"
 
 namespace v8 {
 namespace internal {
 namespace compiler {
 
-ZoneStats::StatsScope::StatsScope(ZoneStats* zone_stats)
-    : zone_stats_(zone_stats),
-      total_allocated_bytes_at_start_(zone_stats->GetTotalAllocatedBytes()),
+ZonePool::StatsScope::StatsScope(ZonePool* zone_pool)
+    : zone_pool_(zone_pool),
+      total_allocated_bytes_at_start_(zone_pool->GetTotalAllocatedBytes()),
       max_allocated_bytes_(0) {
-  zone_stats_->stats_.push_back(this);
-  for (Zone* zone : zone_stats_->zones_) {
+  zone_pool_->stats_.push_back(this);
+  for (Zone* zone : zone_pool_->used_) {
     size_t size = static_cast<size_t>(zone->allocation_size());
     std::pair<InitialValues::iterator, bool> res =
         initial_values_.insert(std::make_pair(zone, size));
@@ -22,18 +22,21 @@ ZoneStats::StatsScope::StatsScope(ZoneStats* zone_stats)
   }
 }
 
-ZoneStats::StatsScope::~StatsScope() {
-  DCHECK_EQ(zone_stats_->stats_.back(), this);
-  zone_stats_->stats_.pop_back();
+
+ZonePool::StatsScope::~StatsScope() {
+  DCHECK_EQ(zone_pool_->stats_.back(), this);
+  zone_pool_->stats_.pop_back();
 }
 
-size_t ZoneStats::StatsScope::GetMaxAllocatedBytes() {
+
+size_t ZonePool::StatsScope::GetMaxAllocatedBytes() {
   return std::max(max_allocated_bytes_, GetCurrentAllocatedBytes());
 }
 
-size_t ZoneStats::StatsScope::GetCurrentAllocatedBytes() {
+
+size_t ZonePool::StatsScope::GetCurrentAllocatedBytes() {
   size_t total = 0;
-  for (Zone* zone : zone_stats_->zones_) {
+  for (Zone* zone : zone_pool_->used_) {
     total += static_cast<size_t>(zone->allocation_size());
     // Adjust for initial values.
     InitialValues::iterator it = initial_values_.find(zone);
@@ -44,12 +47,13 @@ size_t ZoneStats::StatsScope::GetCurrentAllocatedBytes() {
   return total;
 }
 
-size_t ZoneStats::StatsScope::GetTotalAllocatedBytes() {
-  return zone_stats_->GetTotalAllocatedBytes() -
-         total_allocated_bytes_at_start_;
+
+size_t ZonePool::StatsScope::GetTotalAllocatedBytes() {
+  return zone_pool_->GetTotalAllocatedBytes() - total_allocated_bytes_at_start_;
 }
 
-void ZoneStats::StatsScope::ZoneReturned(Zone* zone) {
+
+void ZonePool::StatsScope::ZoneReturned(Zone* zone) {
   size_t current_total = GetCurrentAllocatedBytes();
   // Update max.
   max_allocated_bytes_ = std::max(max_allocated_bytes_, current_total);
@@ -60,37 +64,53 @@ void ZoneStats::StatsScope::ZoneReturned(Zone* zone) {
   }
 }
 
-ZoneStats::ZoneStats(AccountingAllocator* allocator)
+ZonePool::ZonePool(AccountingAllocator* allocator)
     : max_allocated_bytes_(0), total_deleted_bytes_(0), allocator_(allocator) {}
 
-ZoneStats::~ZoneStats() {
-  DCHECK(zones_.empty());
+ZonePool::~ZonePool() {
+  DCHECK(used_.empty());
   DCHECK(stats_.empty());
+  for (Zone* zone : unused_) {
+    delete zone;
+  }
 }
 
-size_t ZoneStats::GetMaxAllocatedBytes() {
+
+size_t ZonePool::GetMaxAllocatedBytes() {
   return std::max(max_allocated_bytes_, GetCurrentAllocatedBytes());
 }
 
-size_t ZoneStats::GetCurrentAllocatedBytes() {
+
+size_t ZonePool::GetCurrentAllocatedBytes() {
   size_t total = 0;
-  for (Zone* zone : zones_) {
+  for (Zone* zone : used_) {
     total += static_cast<size_t>(zone->allocation_size());
   }
   return total;
 }
 
-size_t ZoneStats::GetTotalAllocatedBytes() {
+
+size_t ZonePool::GetTotalAllocatedBytes() {
   return total_deleted_bytes_ + GetCurrentAllocatedBytes();
 }
 
-Zone* ZoneStats::NewEmptyZone() {
-  Zone* zone = new Zone(allocator_);
-  zones_.push_back(zone);
+
+Zone* ZonePool::NewEmptyZone() {
+  Zone* zone;
+  // Grab a zone from pool if possible.
+  if (!unused_.empty()) {
+    zone = unused_.back();
+    unused_.pop_back();
+  } else {
+    zone = new Zone(allocator_);
+  }
+  used_.push_back(zone);
+  DCHECK_EQ(0u, zone->allocation_size());
   return zone;
 }
 
-void ZoneStats::ReturnZone(Zone* zone) {
+
+void ZonePool::ReturnZone(Zone* zone) {
   size_t current_total = GetCurrentAllocatedBytes();
   // Update max.
   max_allocated_bytes_ = std::max(max_allocated_bytes_, current_total);
@@ -99,11 +119,18 @@ void ZoneStats::ReturnZone(Zone* zone) {
     stat_scope->ZoneReturned(zone);
   }
   // Remove from used.
-  Zones::iterator it = std::find(zones_.begin(), zones_.end(), zone);
-  DCHECK(it != zones_.end());
-  zones_.erase(it);
+  Used::iterator it = std::find(used_.begin(), used_.end(), zone);
+  DCHECK(it != used_.end());
+  used_.erase(it);
   total_deleted_bytes_ += static_cast<size_t>(zone->allocation_size());
-  delete zone;
+  // Delete zone or clear and stash on unused_.
+  if (unused_.size() >= kMaxUnusedSize) {
+    delete zone;
+  } else {
+    zone->DeleteAll();
+    DCHECK_EQ(0u, zone->allocation_size());
+    unused_.push_back(zone);
+  }
 }
 
 }  // namespace compiler