| Index: src/compiler/wasm-compiler.cc
|
| diff --git a/src/compiler/wasm-compiler.cc b/src/compiler/wasm-compiler.cc
|
| index 7caaebc4b54dedd00bcda2932bec6b515f7934ef..3c8510a6b109d014696890c09b2b200c4b275faf 100644
|
| --- a/src/compiler/wasm-compiler.cc
|
| +++ b/src/compiler/wasm-compiler.cc
|
| @@ -2386,6 +2386,8 @@ Node* WasmGraphBuilder::BuildJavaScriptToNumber(Node* node, Node* context) {
|
| Node* result = graph()->NewNode(jsgraph()->common()->Call(desc), stub_code,
|
| node, context, *effect_, *control_);
|
|
|
| + SetSourcePosition(result, 1);
|
| +
|
| *effect_ = result;
|
|
|
| return result;
|
| @@ -2785,6 +2787,7 @@ void WasmGraphBuilder::BuildWasmToJSWrapper(Handle<JSReceiver> target,
|
| }
|
|
|
| *effect_ = call;
|
| + SetSourcePosition(call, 0);
|
|
|
| // Convert the return value back.
|
| Node* i32_zero = jsgraph()->Int32Constant(0);
|
| @@ -3259,7 +3262,8 @@ Handle<Code> CompileJSToWasmWrapper(Isolate* isolate,
|
| Handle<Code> CompileWasmToJSWrapper(Isolate* isolate, Handle<JSReceiver> target,
|
| wasm::FunctionSig* sig, uint32_t index,
|
| Handle<String> module_name,
|
| - MaybeHandle<String> import_name) {
|
| + MaybeHandle<String> import_name,
|
| + wasm::ModuleOrigin origin) {
|
| //----------------------------------------------------------------------------
|
| // Create the Graph
|
| //----------------------------------------------------------------------------
|
| @@ -3272,7 +3276,11 @@ Handle<Code> CompileWasmToJSWrapper(Isolate* isolate, Handle<JSReceiver> target,
|
| Node* control = nullptr;
|
| Node* effect = nullptr;
|
|
|
| - WasmGraphBuilder builder(&zone, &jsgraph, sig);
|
| + SourcePositionTable* source_position_table =
|
| + origin == wasm::kAsmJsOrigin ? new (&zone) SourcePositionTable(&graph)
|
| + : nullptr;
|
| +
|
| + WasmGraphBuilder builder(&zone, &jsgraph, sig, source_position_table);
|
| builder.set_control_ptr(&control);
|
| builder.set_effect_ptr(&effect);
|
| builder.BuildWasmToJSWrapper(target, sig);
|
| @@ -3308,7 +3316,8 @@ Handle<Code> CompileWasmToJSWrapper(Isolate* isolate, Handle<JSReceiver> target,
|
| }
|
|
|
| CompilationInfo info(func_name, isolate, &zone, flags);
|
| - code = Pipeline::GenerateCodeForTesting(&info, incoming, &graph, nullptr);
|
| + code = Pipeline::GenerateCodeForTesting(&info, incoming, &graph, nullptr,
|
| + source_position_table);
|
| #ifdef ENABLE_DISASSEMBLER
|
| if (FLAG_print_opt_code && !code.is_null()) {
|
| OFStream os(stdout);
|
|
|