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

src/asmjs/asm-typer.cc

 // Copyright 2016 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.
 
 #include "src/asmjs/asm-typer.h"
 
 #include <algorithm>
 #include <limits>
 #include <memory>
 #include <string>
@@ skipping 343 matching lines @@
   // We can't DCHECK(!in_function_) because function may actually install global
   // names (forward defined functions and function tables.)
   DCHECK(info->mutability() != VariableInfo::kInvalidMutability);
   DCHECK(info->IsGlobal());
   DCHECK(ValidAsmIdentifier(variable->name()));
 
   if (!module_name_.is_null() && module_name_->Equals(*variable->name())) {
     return false;
   }
 
-  ZoneHashMap::Entry* entry =
-      global_scope_.LookupOrInsert(variable, ComputePointerHash(variable));
+  ZoneHashMap::Entry* entry = global_scope_.LookupOrInsert(
+      variable, ComputePointerHash(variable), ZoneAllocationPolicy(zone_));
 
   if (entry->value != nullptr) {
     return false;
   }
 
   entry->value = info;
   return true;
 }
 
 bool AsmTyper::AddLocal(Variable* variable, VariableInfo* info) {
   DCHECK(in_function_);
   DCHECK(info->mutability() != VariableInfo::kInvalidMutability);
   DCHECK(!info->IsGlobal());
   DCHECK(ValidAsmIdentifier(variable->name()));
 
-  ZoneHashMap::Entry* entry =
-      local_scope_.LookupOrInsert(variable, ComputePointerHash(variable));
+  ZoneHashMap::Entry* entry = local_scope_.LookupOrInsert(
+      variable, ComputePointerHash(variable), ZoneAllocationPolicy(zone_));
 
   if (entry->value != nullptr) {
     return false;
   }
 
   entry->value = info;
   return true;
 }
 
 void AsmTyper::SetTypeOf(AstNode* node, AsmType* type) {
@@ skipping 2372 matching lines @@
     return true;
   }
 
   *error_message = typer.error_message();
   return false;
 }
 
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8