| Index: src/asmjs/asm-wasm-builder.cc
|
| diff --git a/src/asmjs/asm-wasm-builder.cc b/src/asmjs/asm-wasm-builder.cc
|
| index 00e304bbcb76edd7b89d4408b720cd434c9b2161..5425be8a59e58d501a2b5211aa82dcc2ed0c99ef 100644
|
| --- a/src/asmjs/asm-wasm-builder.cc
|
| +++ b/src/asmjs/asm-wasm-builder.cc
|
| @@ -656,8 +656,8 @@ class AsmWasmBuilderImpl final : public AstVisitor<AsmWasmBuilderImpl> {
|
| FunctionTableIndices* container = new (zone()) FunctionTableIndices();
|
| container->start_index = start_index;
|
| container->signature_index = signature_index;
|
| - ZoneHashMap::Entry* entry = function_tables_.LookupOrInsert(
|
| - v, ComputePointerHash(v), ZoneAllocationPolicy(zone()));
|
| + ZoneHashMap::Entry* entry =
|
| + function_tables_.LookupOrInsert(v, ComputePointerHash(v));
|
| entry->value = container;
|
| }
|
|
|
| @@ -692,8 +692,8 @@ class AsmWasmBuilderImpl final : public AstVisitor<AsmWasmBuilderImpl> {
|
| void AddImport(Variable* v, const char* name, int name_length) {
|
| ImportedFunctionIndices* indices = new (builder_->zone())
|
| ImportedFunctionIndices(name, name_length, builder_->zone());
|
| - ZoneHashMap::Entry* entry = table_.LookupOrInsert(
|
| - v, ComputePointerHash(v), ZoneAllocationPolicy(builder_->zone()));
|
| + ZoneHashMap::Entry* entry =
|
| + table_.LookupOrInsert(v, ComputePointerHash(v));
|
| entry->value = indices;
|
| }
|
|
|
| @@ -1686,8 +1686,7 @@ class AsmWasmBuilderImpl final : public AstVisitor<AsmWasmBuilderImpl> {
|
| index = current_function_builder_->AddLocal(type);
|
| IndexContainer* container = new (zone()) IndexContainer();
|
| container->index = index;
|
| - entry = local_variables_.LookupOrInsert(v, ComputePointerHash(v),
|
| - ZoneAllocationPolicy(zone()));
|
| + entry = local_variables_.LookupOrInsert(v, ComputePointerHash(v));
|
| entry->value = container;
|
| }
|
| return (reinterpret_cast<IndexContainer*>(entry->value))->index;
|
| @@ -1701,8 +1700,7 @@ class AsmWasmBuilderImpl final : public AstVisitor<AsmWasmBuilderImpl> {
|
| DCHECK_NULL(entry);
|
| IndexContainer* container = new (zone()) IndexContainer();
|
| container->index = index;
|
| - entry = local_variables_.LookupOrInsert(v, ComputePointerHash(v),
|
| - ZoneAllocationPolicy(zone()));
|
| + entry = local_variables_.LookupOrInsert(v, ComputePointerHash(v));
|
| entry->value = container;
|
| }
|
|
|
| @@ -1713,8 +1711,7 @@ class AsmWasmBuilderImpl final : public AstVisitor<AsmWasmBuilderImpl> {
|
| uint32_t index = builder_->AddGlobal(type, 0);
|
| IndexContainer* container = new (zone()) IndexContainer();
|
| container->index = index;
|
| - entry = global_variables_.LookupOrInsert(v, ComputePointerHash(v),
|
| - ZoneAllocationPolicy(zone()));
|
| + entry = global_variables_.LookupOrInsert(v, ComputePointerHash(v));
|
| entry->value = container;
|
| }
|
| return (reinterpret_cast<IndexContainer*>(entry->value))->index;
|
| @@ -1727,8 +1724,7 @@ class AsmWasmBuilderImpl final : public AstVisitor<AsmWasmBuilderImpl> {
|
| uint32_t index = builder_->AddFunction();
|
| IndexContainer* container = new (zone()) IndexContainer();
|
| container->index = index;
|
| - entry = functions_.LookupOrInsert(v, ComputePointerHash(v),
|
| - ZoneAllocationPolicy(zone()));
|
| + entry = functions_.LookupOrInsert(v, ComputePointerHash(v));
|
| entry->value = container;
|
| }
|
| return (reinterpret_cast<IndexContainer*>(entry->value))->index;
|
|
|