Refactor allocation policies.

src/splay-tree-inl.h

 // Copyright 2010 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 18 matching lines @@
 #define V8_SPLAY_TREE_INL_H_
 
 #include "splay-tree.h"
 
 namespace v8 {
 namespace internal {
 
 
 template<typename Config, class Allocator>
 SplayTree<Config, Allocator>::~SplayTree() {
-  NodeDeleter deleter;
+  NodeDeleter deleter(&allocator_);
   ForEachNode(&deleter);
 }
 
 
 template<typename Config, class Allocator>
 bool SplayTree<Config, Allocator>::Insert(const Key& key, Locator* locator) {
   if (is_empty()) {
     // If the tree is empty, insert the new node.
-    root_ = new Node(key, Config::kNoValue);
+    root_ = new(&allocator_) Node(key, Config::kNoValue);
   } else {
     // Splay on the key to move the last node on the search path
     // for the key to the root of the tree.
     Splay(key);
     // Ignore repeated insertions with the same key.
     int cmp = Config::Compare(key, root_->key_);
     if (cmp == 0) {
       locator->bind(root_);
       return false;
     }
     // Insert the new node.
-    Node* node = new Node(key, Config::kNoValue);
+    Node* node = new(&allocator_) Node(key, Config::kNoValue);
     InsertInternal(cmp, node);
   }
   locator->bind(root_);
   return true;
 }
 
 
 template<typename Config, class Allocator>
 void SplayTree<Config, Allocator>::InsertInternal(int cmp, Node* node) {
   if (cmp > 0) {
@@ skipping 105 matching lines @@
 bool SplayTree<Config, Allocator>::Move(const Key& old_key,
                                         const Key& new_key) {
   if (!FindInternal(old_key))
     return false;
   Node* node_to_move = root_;
   RemoveRootNode(old_key);
   Splay(new_key);
   int cmp = Config::Compare(new_key, root_->key_);
   if (cmp == 0) {
     // A node with the target key already exists.
-    delete node_to_move;
+    Node::Delete(&allocator_, node_to_move);
     return false;
   }
   node_to_move->key_ = new_key;
   InsertInternal(cmp, node_to_move);
   return true;
 }
 
 
 template<typename Config, class Allocator>
 bool SplayTree<Config, Allocator>::Remove(const Key& key) {
   if (!FindInternal(key))
     return false;
   Node* node_to_remove = root_;
   RemoveRootNode(key);
-  delete node_to_remove;
+  Node::Delete(&allocator_, node_to_remove);
   return true;
 }
 
 
 template<typename Config, class Allocator>
 void SplayTree<Config, Allocator>::RemoveRootNode(const Key& key) {
   if (root_->left_ == NULL) {
     // No left child, so the new tree is just the right child.
     root_ = root_->right_;
   } else {
@@ skipping 74 matching lines @@
 template <typename Config, class Allocator> template <class Callback>
 void SplayTree<Config, Allocator>::ForEach(Callback* callback) {
   NodeToPairAdaptor<Callback> callback_adaptor(callback);
   ForEachNode(&callback_adaptor);
 }
 
 
 template <typename Config, class Allocator> template <class Callback>
 void SplayTree<Config, Allocator>::ForEachNode(Callback* callback) {
   // Pre-allocate some space for tiny trees.
-  List<Node*, Allocator> nodes_to_visit(10);
+  List<Node*, Allocator> nodes_to_visit(10, allocator_);
   if (root_ != NULL) nodes_to_visit.Add(root_);
   int pos = 0;
   while (pos < nodes_to_visit.length()) {
     Node* node = nodes_to_visit[pos++];
     if (node->left() != NULL) nodes_to_visit.Add(node->left());
     if (node->right() != NULL) nodes_to_visit.Add(node->right());
     callback->Call(node);
   }
 }
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_SPLAY_TREE_INL_H_