Version 5.6.1.1 (cherry-pick)

src/compiler/zone-pool.h

Index: src/compiler/zone-pool.h
diff --git a/src/compiler/zone-stats.h b/src/compiler/zone-pool.h
similarity index 68%
rename from src/compiler/zone-stats.h
rename to src/compiler/zone-pool.h
index 611c96ee668e83d4b484ea9c5d37a4ca6fbc3a39..7a3fe75468046285d9647bf2ba538bcbaa5a0dc4 100644
--- a/src/compiler/zone-stats.h
+++ b/src/compiler/zone-pool.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_COMPILER_ZONE_STATS_H_
-#define V8_COMPILER_ZONE_STATS_H_
+#ifndef V8_COMPILER_ZONE_POOL_H_
+#define V8_COMPILER_ZONE_POOL_H_
 
 #include <map>
 #include <set>
@@ -15,32 +15,32 @@ namespace v8 {
 namespace internal {
 namespace compiler {
 
-class ZoneStats final {
+class ZonePool final {
  public:
   class Scope final {
    public:
-    explicit Scope(ZoneStats* zone_stats)
-        : zone_stats_(zone_stats), zone_(nullptr) {}
+    explicit Scope(ZonePool* zone_pool)
+        : zone_pool_(zone_pool), zone_(nullptr) {}
     ~Scope() { Destroy(); }
 
     Zone* zone() {
-      if (zone_ == nullptr) zone_ = zone_stats_->NewEmptyZone();
+      if (zone_ == nullptr) zone_ = zone_pool_->NewEmptyZone();
       return zone_;
     }
     void Destroy() {
-      if (zone_ != nullptr) zone_stats_->ReturnZone(zone_);
+      if (zone_ != nullptr) zone_pool_->ReturnZone(zone_);
       zone_ = nullptr;
     }
 
    private:
-    ZoneStats* const zone_stats_;
+    ZonePool* const zone_pool_;
     Zone* zone_;
     DISALLOW_COPY_AND_ASSIGN(Scope);
   };
 
   class StatsScope final {
    public:
-    explicit StatsScope(ZoneStats* zone_stats);
+    explicit StatsScope(ZonePool* zone_pool);
     ~StatsScope();
 
     size_t GetMaxAllocatedBytes();
@@ -48,12 +48,12 @@ class ZoneStats final {
     size_t GetTotalAllocatedBytes();
 
    private:
-    friend class ZoneStats;
+    friend class ZonePool;
     void ZoneReturned(Zone* zone);
 
     typedef std::map<Zone*, size_t> InitialValues;
 
-    ZoneStats* const zone_stats_;
+    ZonePool* const zone_pool_;
     InitialValues initial_values_;
     size_t total_allocated_bytes_at_start_;
     size_t max_allocated_bytes_;
@@ -61,8 +61,8 @@ class ZoneStats final {
     DISALLOW_COPY_AND_ASSIGN(StatsScope);
   };
 
-  explicit ZoneStats(AccountingAllocator* allocator);
-  ~ZoneStats();
+  explicit ZonePool(AccountingAllocator* allocator);
+  ~ZonePool();
 
   size_t GetMaxAllocatedBytes();
   size_t GetTotalAllocatedBytes();
@@ -73,20 +73,22 @@ class ZoneStats final {
   void ReturnZone(Zone* zone);
 
   static const size_t kMaxUnusedSize = 3;
-  typedef std::vector<Zone*> Zones;
+  typedef std::vector<Zone*> Unused;
+  typedef std::vector<Zone*> Used;
   typedef std::vector<StatsScope*> Stats;
 
-  Zones zones_;
+  Unused unused_;
+  Used used_;
   Stats stats_;
   size_t max_allocated_bytes_;
   size_t total_deleted_bytes_;
   AccountingAllocator* allocator_;
 
-  DISALLOW_COPY_AND_ASSIGN(ZoneStats);
+  DISALLOW_COPY_AND_ASSIGN(ZonePool);
 };
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
-#endif  // V8_COMPILER_ZONE_STATS_H_
+#endif