Split an allocation policy into an allocator and a deallocator.

src/zone.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 146 matching lines @@
   // require the operator to be visible. MSVC requires the delete
   // operator to be public.
 
   // ZoneObjects should never be deleted individually; use
   // Zone::DeleteAll() to delete all zone objects in one go.
   void operator delete(void*, size_t) { UNREACHABLE(); }
   void operator delete(void* pointer, Zone* zone) { UNREACHABLE(); }
 };
 
 
-// The ZoneListAllocationPolicy is used to specialize the GenericList
+class ZoneAllocator {
+ public:
+  INLINE(void* New(int size));
+};
+
+
+// De-allocation attempts are silently ignored.
+class ZoneDeallocator {
+ public:
+  INLINE(void Delete(void* ptr)) { }
+};
+
+
+// The ZoneAllocationPolicy is used to specialize the generic List
 // implementation to allocate ZoneLists and their elements in the
 // Zone.
-class ZoneListAllocationPolicy {
- public:
-  // Allocate 'size' bytes of memory in the zone.
-  static void* New(int size);
-
-  // De-allocation attempts are silently ignored.
-  static void Delete(void* p) { }
+struct ZoneAllocationPolicy {
+  typedef ZoneAllocator Allocator;
+  typedef ZoneDeallocator Deallocator;
 };
 
-
 // ZoneLists are growable lists with constant-time access to the
 // elements. The list itself and all its elements are allocated in the
 // Zone. ZoneLists cannot be deleted individually; you can delete all
 // objects in the Zone by calling Zone::DeleteAll().
 template<typename T>
-class ZoneList: public List<T, ZoneListAllocationPolicy> {
+class ZoneList: public List<T, ZoneAllocationPolicy> {
  public:
-  INLINE(void* operator new(size_t size));
-  INLINE(void* operator new(size_t size, Zone* zone));
-
   // Construct a new ZoneList with the given capacity; the length is
   // always zero. The capacity must be non-negative.
   explicit ZoneList(int capacity)
-      : List<T, ZoneListAllocationPolicy>(capacity) { }
+      : List<T, ZoneAllocationPolicy>(capacity) { }
+
+  INLINE(void* operator new(size_t size, Zone* zone));
+  INLINE(void* operator new(size_t size));
 
   // Construct a new ZoneList by copying the elements of the given ZoneList.
-  explicit ZoneList(const ZoneList<T>& other)
-      : List<T, ZoneListAllocationPolicy>(other.length()) {
-    AddAll(other);
+  explicit ZoneList(const ZoneList<T>& other, ZoneAllocator alloc)
+      : List<T, ZoneAllocationPolicy>(other.length()) {
+    AddAll(other, alloc);
   }
 
   void operator delete(void* pointer) { UNREACHABLE(); }
   void operator delete(void* pointer, Zone* zone) { UNREACHABLE(); }
 };
 
 
 // ZoneScopes keep track of the current parsing and compilation
 // nesting and cleans up generated ASTs in the Zone when exiting the
 // outer-most scope.
@@ skipping 16 matching lines @@
  private:
   Isolate* isolate_;
   ZoneScopeMode mode_;
 };
 
 
 // A zone splay tree.  The config type parameter encapsulates the
 // different configurations of a concrete splay tree (see splay-tree.h).
 // The tree itself and all its elements are allocated in the Zone.
 template <typename Config>
-class ZoneSplayTree: public SplayTree<Config, ZoneListAllocationPolicy> {
+class ZoneSplayTree: public SplayTree<Config, ZoneAllocationPolicy> {
  public:
   ZoneSplayTree()
-      : SplayTree<Config, ZoneListAllocationPolicy>() {}
+      : SplayTree<Config, ZoneAllocationPolicy>() {}
   ~ZoneSplayTree();
 };
 
 
-typedef TemplateHashMapImpl<ZoneListAllocationPolicy> ZoneHashMap;
+typedef TemplateHashMapImpl<ZoneAllocationPolicy> ZoneHashMap;
 
 } }  // namespace v8::internal
 
 #endif  // V8_ZONE_H_