Remove TLS access for current Zone.

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;
-  ForEachNode(&deleter);
+  // Pre-allocate some space for tiny trees.  Since we don't have an
+  // Allocator object here, we allocate the list on the heap.
+  List<Node*> nodes_to_visit(10);
+  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());
+    Allocator::Delete(node);
+  }

[danno, 2012/06/06 10:59:53]

Store the allocator inside the splay tree so that you can use the existing code.

[sanjoy, 2012/06/06 11:43:54]

Done.

 }
 
 
 template<typename Config, class Allocator>
 bool SplayTree<Config, Allocator>::Insert(const Key& key,
                                           Locator* locator,
                                           Allocator allocator) {
   if (is_empty()) {
     // If the tree is empty, insert the new node.
     root_ = new(allocator) Node(key, Config::NoValue());
@@ skipping 228 matching lines @@
   // Assemble.
   left->right_ = current->left_;
   right->left_ = current->right_;
   current->left_ = dummy->right_;
   current->right_ = dummy->left_;
   root_ = current;
 }
 
 
 template <typename Config, class Allocator> template <class Callback>
-void SplayTree<Config, Allocator>::ForEach(Callback* callback) {
+void SplayTree<Config, Allocator>::ForEach(Callback* callback,
+                                           Allocator allocator) {
   NodeToPairAdaptor<Callback> callback_adaptor(callback);
-  ForEachNode(&callback_adaptor);
+  ForEachNode(&callback_adaptor, allocator);
 }
 
 
 template <typename Config, class Allocator> template <class Callback>
 void SplayTree<Config, Allocator>::ForEachNode(Callback* callback,
                                                Allocator allocator) {
   // 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_, allocator);
   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(), allocator);
     if (node->right() != NULL) nodes_to_visit.Add(node->right(), allocator);
     callback->Call(node);
   }
 }
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_SPLAY_TREE_INL_H_