Index: src/wasm/module-decoder.cc |
diff --git a/src/wasm/module-decoder.cc b/src/wasm/module-decoder.cc |
index d3c08bde527028a6c9ac5a742d0571b05aae2d98..d3feb4c3571b62f673ad90ccefc26ea80b907680 100644 |
--- a/src/wasm/module-decoder.cc |
+++ b/src/wasm/module-decoder.cc |
@@ -780,21 +780,22 @@ class ModuleDecoder : public Decoder { |
// Verifies the body (code) of a given function. |
void VerifyFunctionBody(uint32_t func_num, ModuleBytesEnv* menv, |
WasmFunction* function) { |
+ WasmFunctionName func_name(function, |
+ menv->wire_bytes.GetNameOrNull(function)); |
if (FLAG_trace_wasm_decoder || FLAG_trace_wasm_decode_time) { |
OFStream os(stdout); |
- os << "Verifying WASM function " << WasmFunctionName(function, menv) |
- << std::endl; |
+ os << "Verifying WASM function " << func_name << std::endl; |
} |
FunctionBody body = {function->sig, start_, |
start_ + function->code_start_offset, |
start_ + function->code_end_offset}; |
- DecodeResult result = |
- VerifyWasmCode(module_zone->allocator(), |
- menv == nullptr ? nullptr : menv->module, body); |
+ DecodeResult result = VerifyWasmCode( |
+ module_zone->allocator(), |
+ menv == nullptr ? nullptr : menv->module_env.module, body); |
if (result.failed()) { |
// Wrap the error message from the function decoder. |
std::ostringstream str; |
- str << "in function " << WasmFunctionName(function, menv) << ": "; |
+ str << "in function " << func_name << ": "; |
str << result; |
std::string strval = str.str(); |
const char* raw = strval.c_str(); |