Split an allocation policy into an allocator and a deallocator.

src/allocation.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 84 matching lines @@
 
 // The normal strdup functions use malloc.  These versions of StrDup
 // and StrNDup uses new and calls the FatalProcessOutOfMemory handler
 // if allocation fails.
 char* StrDup(const char* str);
 char* StrNDup(const char* str, int n);
 
 
 // Allocation policy for allocating in the C free store using malloc
 // and free. Used as the default policy for lists.
-class FreeStoreAllocationPolicy {
+class FreeStoreAllocator {
  public:
-  INLINE(static void* New(size_t size)) { return Malloced::New(size); }
-  INLINE(static void Delete(void* p)) { Malloced::Delete(p); }
+  INLINE(void* New(size_t size)) { return Malloced::New(size); }
 };
 
 
+class FreeStoreDeallocator {
+ public:
+  INLINE(void Delete(void *ptr)) { Malloced::Delete(ptr); }
+};
+
+
+struct FreeStoreAllocationPolicy {
+  typedef FreeStoreAllocator Alloc;
+  typedef FreeStoreDeallocator Dealloc;
+};
+
+
 // Allocation policy for allocating in preallocated space.
 // Used as an allocation policy for ScopeInfo when generating
 // stack traces.
 class PreallocatedStorage {
  public:
   explicit PreallocatedStorage(size_t size);
   size_t size() { return size_; }
 
-  // TODO(isolates): Get rid of these-- we'll have to change the allocator
-  //                 interface to include a pointer to an isolate to do this
-  //                 efficiently.
-  static inline void* New(size_t size);
-  static inline void Delete(void* p);
-
  private:
   size_t size_;
   PreallocatedStorage* previous_;
   PreallocatedStorage* next_;
 
   void LinkTo(PreallocatedStorage* other);
   void Unlink();
 
   friend class Isolate;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(PreallocatedStorage);
 };
 
 
+class PreallocatedStorageAllocator {
+ public:
+  INLINE(void* New(size_t size));
+};
+
+
+class PreallocatedStorageDeallocator {
+ public:
+  INLINE(void Delete(void* ptr));
+};
+
+
+struct PreallocatedStorageAllocationPolicy {
+  typedef PreallocatedStorageAllocator Alloc;
+  typedef PreallocatedStorageDeallocator Dealloc;
+};
+
+
 } }  // namespace v8::internal
 
 #endif  // V8_ALLOCATION_H_