[base] Revert "Move hashmap allocator to a field"

src/ast/ast.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_AST_AST_H_
 #define V8_AST_AST_H_
 
 #include "src/ast/ast-types.h"
 #include "src/ast/ast-value-factory.h"
 #include "src/ast/modules.h"
@@ skipping 111 matching lines @@
 class TypeFeedbackOracle;
 
 #define DEF_FORWARD_DECLARATION(type) class type;
 AST_NODE_LIST(DEF_FORWARD_DECLARATION)
 #undef DEF_FORWARD_DECLARATION
 
 
 class FeedbackVectorSlotCache {
  public:
   explicit FeedbackVectorSlotCache(Zone* zone)
-      : hash_map_(base::HashMap::PointersMatch,
+      : zone_(zone),
+        hash_map_(base::HashMap::PointersMatch,
                   ZoneHashMap::kDefaultHashMapCapacity,
                   ZoneAllocationPolicy(zone)) {}
 
   void Put(Variable* variable, FeedbackVectorSlot slot) {
-    ZoneHashMap::Entry* entry =
-        hash_map_.LookupOrInsert(variable, ComputePointerHash(variable));
+    ZoneHashMap::Entry* entry = hash_map_.LookupOrInsert(
+        variable, ComputePointerHash(variable), ZoneAllocationPolicy(zone_));
     entry->value = reinterpret_cast<void*>(slot.ToInt());
   }
 
   ZoneHashMap::Entry* Get(Variable* variable) const {
     return hash_map_.Lookup(variable, ComputePointerHash(variable));
   }
 
  private:
+  Zone* zone_;
   ZoneHashMap hash_map_;
 };
 
 
 class AstProperties final BASE_EMBEDDED {
  public:
   enum Flag {
     kNoFlags = 0,
     kDontSelfOptimize = 1 << 0,
     kDontCrankshaft = 1 << 1
@@ skipping 1359 matching lines @@
     : public base::TemplateHashMap<Literal, ObjectLiteral::Accessors,
                                    ZoneAllocationPolicy> {
  public:
   explicit AccessorTable(Zone* zone)
       : base::TemplateHashMap<Literal, ObjectLiteral::Accessors,
                               ZoneAllocationPolicy>(Literal::Match,
                                                     ZoneAllocationPolicy(zone)),
         zone_(zone) {}
 
   Iterator lookup(Literal* literal) {
-    Iterator it = find(literal, true);
+    Iterator it = find(literal, true, ZoneAllocationPolicy(zone_));
     if (it->second == NULL) it->second = new (zone_) ObjectLiteral::Accessors();
     return it;
   }
 
  private:
   Zone* zone_;
 };
 
 
 // Node for capturing a regexp literal.
@@ skipping 2070 matching lines @@
                                     : NULL;                                   \
   }
 AST_NODE_LIST(DECLARE_NODE_FUNCTIONS)
 #undef DECLARE_NODE_FUNCTIONS
 
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_AST_AST_H_