| Index: src/wasm/ast-decoder.cc
|
| diff --git a/src/wasm/ast-decoder.cc b/src/wasm/ast-decoder.cc
|
| index 4795f84e7a8440ab3c57d0782a87090e8dd54c8e..c60da4f17df41722c140ec3158e8440ddf290daf 100644
|
| --- a/src/wasm/ast-decoder.cc
|
| +++ b/src/wasm/ast-decoder.cc
|
| @@ -7,7 +7,7 @@
|
| #include "src/bit-vector.h"
|
| #include "src/flags.h"
|
| #include "src/handles.h"
|
| -#include "src/zone-containers.h"
|
| +#include "src/zone/zone-containers.h"
|
|
|
| #include "src/wasm/ast-decoder.h"
|
| #include "src/wasm/decoder.h"
|
| @@ -1650,7 +1650,7 @@ class WasmFullDecoder : public WasmDecoder {
|
|
|
| bool DecodeLocalDecls(AstLocalDecls& decls, const byte* start,
|
| const byte* end) {
|
| - base::AccountingAllocator allocator;
|
| + AccountingAllocator allocator;
|
| Zone tmp(&allocator);
|
| FunctionBody body = {nullptr, nullptr, nullptr, start, end};
|
| WasmFullDecoder decoder(&tmp, nullptr, body);
|
| @@ -1668,7 +1668,7 @@ BytecodeIterator::BytecodeIterator(const byte* start, const byte* end,
|
| }
|
| }
|
|
|
| -DecodeResult VerifyWasmCode(base::AccountingAllocator* allocator,
|
| +DecodeResult VerifyWasmCode(AccountingAllocator* allocator,
|
| FunctionBody& body) {
|
| Zone zone(allocator);
|
| WasmFullDecoder decoder(&zone, nullptr, body);
|
| @@ -1676,8 +1676,8 @@ DecodeResult VerifyWasmCode(base::AccountingAllocator* allocator,
|
| return decoder.toResult<DecodeStruct*>(nullptr);
|
| }
|
|
|
| -DecodeResult BuildTFGraph(base::AccountingAllocator* allocator,
|
| - TFBuilder* builder, FunctionBody& body) {
|
| +DecodeResult BuildTFGraph(AccountingAllocator* allocator, TFBuilder* builder,
|
| + FunctionBody& body) {
|
| Zone zone(allocator);
|
| WasmFullDecoder decoder(&zone, builder, body);
|
| decoder.Decode();
|
| @@ -1695,12 +1695,12 @@ unsigned OpcodeArity(const byte* pc, const byte* end) {
|
| }
|
|
|
| void PrintAstForDebugging(const byte* start, const byte* end) {
|
| - base::AccountingAllocator allocator;
|
| + AccountingAllocator allocator;
|
| OFStream os(stdout);
|
| PrintAst(&allocator, FunctionBodyForTesting(start, end), os, nullptr);
|
| }
|
|
|
| -bool PrintAst(base::AccountingAllocator* allocator, const FunctionBody& body,
|
| +bool PrintAst(AccountingAllocator* allocator, const FunctionBody& body,
|
| std::ostream& os,
|
| std::vector<std::tuple<uint32_t, int, int>>* offset_table) {
|
| Zone zone(allocator);
|
|
|