Remove TLS access for current Zone.

src/interface.cc

 // 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 23 matching lines @@
 
 static bool Match(void* key1, void* key2) {
   String* name1 = *static_cast<String**>(key1);
   String* name2 = *static_cast<String**>(key2);
   ASSERT(name1->IsSymbol());
   ASSERT(name2->IsSymbol());
   return name1 == name2;
 }
 
 
-Interface* Interface::Lookup(Handle<String> name) {
+Interface* Interface::Lookup(Handle<String> name, Zone* zone) {
   ASSERT(IsModule());
   ZoneHashMap* map = Chase()->exports_;
   if (map == NULL) return NULL;
-  ZoneHashMap::Entry* p = map->Lookup(name.location(), name->Hash(), false);
+  ZoneAllocationPolicy allocator(zone);
+  ZoneHashMap::Entry* p = map->Lookup(name.location(), name->Hash(), false,
+                                      allocator);
   if (p == NULL) return NULL;
   ASSERT(*static_cast<String**>(p->key) == *name);
   ASSERT(p->value != NULL);
   return static_cast<Interface*>(p->value);
 }
 
 
 #ifdef DEBUG
 // Current nesting depth for debug output.
 class Nesting {
  public:
   Nesting()  { current_ += 2; }
   ~Nesting() { current_ -= 2; }
   static int current() { return current_; }
  private:
   static int current_;
 };
 
 int Nesting::current_ = 0;
 #endif
 
 
 void Interface::DoAdd(
-    void* name, uint32_t hash, Interface* interface, bool* ok) {
+    void* name, uint32_t hash, Interface* interface, bool* ok, Zone* zone) {
   MakeModule(ok);
   if (!*ok) return;
 
 #ifdef DEBUG
   if (FLAG_print_interface_details) {
     PrintF("%*s# Adding...\n", Nesting::current(), "");
     PrintF("%*sthis = ", Nesting::current(), "");
     this->Print(Nesting::current());
     PrintF("%*s%s : ", Nesting::current(), "",
            (*static_cast<String**>(name))->ToAsciiArray());
     interface->Print(Nesting::current());
   }
 #endif
 
   ZoneHashMap** map = &Chase()->exports_;
-  if (*map == NULL) *map = new ZoneHashMap(Match, 8);
+  ZoneAllocationPolicy allocator(zone);
 
-  ZoneHashMap::Entry* p = (*map)->Lookup(name, hash, !IsFrozen());
+  if (*map == NULL)
+    *map = new ZoneHashMap(Match, 8, allocator);

[danno, 2012/06/05 13:42:35]

Constant for default argument

[sanjoy, 2012/06/05 14:21:39]

Fixed.

+
+  ZoneHashMap::Entry* p = (*map)->Lookup(name, hash, !IsFrozen(), allocator);
   if (p == NULL) {
     // This didn't have name but was frozen already, that's an error.
     *ok = false;
   } else if (p->value == NULL) {
     p->value = interface;
   } else {
 #ifdef DEBUG
     Nesting nested;
 #endif
-    static_cast<Interface*>(p->value)->Unify(interface, ok);
+    static_cast<Interface*>(p->value)->Unify(interface, ok, zone);
   }
 
 #ifdef DEBUG
   if (FLAG_print_interface_details) {
     PrintF("%*sthis' = ", Nesting::current(), "");
     this->Print(Nesting::current());
     PrintF("%*s# Added.\n", Nesting::current(), "");
   }
 #endif
 }
 
 
-void Interface::Unify(Interface* that, bool* ok) {
-  if (this->forward_) return this->Chase()->Unify(that, ok);
-  if (that->forward_) return this->Unify(that->Chase(), ok);
+void Interface::Unify(Interface* that, bool* ok, Zone* zone) {
+  if (this->forward_) return this->Chase()->Unify(that, ok, zone);
+  if (that->forward_) return this->Unify(that->Chase(), ok, zone);
   ASSERT(this->forward_ == NULL);
   ASSERT(that->forward_ == NULL);
 
   *ok = true;
   if (this == that) return;
   if (this->IsValue()) return that->MakeValue(ok);
   if (that->IsValue()) return this->MakeValue(ok);
 
 #ifdef DEBUG
   if (FLAG_print_interface_details) {
     PrintF("%*s# Unifying...\n", Nesting::current(), "");
     PrintF("%*sthis = ", Nesting::current(), "");
     this->Print(Nesting::current());
     PrintF("%*sthat = ", Nesting::current(), "");
     that->Print(Nesting::current());
   }
 #endif
 
   // Merge the smaller interface into the larger, for performance.
   if (this->exports_ != NULL && (that->exports_ == NULL ||
       this->exports_->occupancy() >= that->exports_->occupancy())) {
-    this->DoUnify(that, ok);
+    this->DoUnify(that, ok, zone);
   } else {
-    that->DoUnify(this, ok);
+    that->DoUnify(this, ok, zone);
   }
 
 #ifdef DEBUG
   if (FLAG_print_interface_details) {
     PrintF("%*sthis' = ", Nesting::current(), "");
     this->Print(Nesting::current());
     PrintF("%*sthat' = ", Nesting::current(), "");
     that->Print(Nesting::current());
     PrintF("%*s# Unified.\n", Nesting::current(), "");
   }
 #endif
 }
 
 
-void Interface::DoUnify(Interface* that, bool* ok) {
+void Interface::DoUnify(Interface* that, bool* ok, Zone* zone) {
   ASSERT(this->forward_ == NULL);
   ASSERT(that->forward_ == NULL);
   ASSERT(!this->IsValue());
   ASSERT(!that->IsValue());
   ASSERT(*ok);
 
 #ifdef DEBUG
     Nesting nested;
 #endif
 
   // Try to merge all members from that into this.
   ZoneHashMap* map = that->exports_;
   if (map != NULL) {
     for (ZoneHashMap::Entry* p = map->Start(); p != NULL; p = map->Next(p)) {
-      this->DoAdd(p->key, p->hash, static_cast<Interface*>(p->value), ok);
+      this->DoAdd(p->key, p->hash, static_cast<Interface*>(p->value), ok, zone);
       if (!*ok) return;
     }
   }
 
   // If the new interface is larger than that's, then there were members in
   // 'this' which 'that' didn't have. If 'that' was frozen that is an error.
   int this_size = this->exports_ == NULL ? 0 : this->exports_->occupancy();
   int that_size = map == NULL ? 0 : map->occupancy();
   if (that->IsFrozen() && this_size > that_size) {
     *ok = false;
@@ skipping 46 matching lines @@
         PrintF("%*s%s : ", n0 + 2, "", name->ToAsciiArray());
         interface->Print(n0 + 2);
       }
       PrintF("%*s}\n", n0, "");
     }
   }
 }
 #endif
 
 } }  // namespace v8::internal