| Index: src/messages.cc
|
| diff --git a/src/messages.cc b/src/messages.cc
|
| index 2726055c2ca8bdab7a43a28965105d0921413eac..7016aa61d02ead4c85e8bc9ae232d7f020d081b9 100644
|
| --- a/src/messages.cc
|
| +++ b/src/messages.cc
|
| @@ -635,7 +635,9 @@ Handle<Object> WasmStackFrame::GetFunction() const {
|
| }
|
|
|
| Handle<Object> WasmStackFrame::GetFunctionName() {
|
| - return wasm::GetWasmFunctionNameOrNull(isolate_, wasm_instance_,
|
| + Handle<wasm::WasmCompiledModule> compiled_module(
|
| + wasm::GetCompiledModule(JSObject::cast(*wasm_instance_)), isolate_);
|
| + return wasm::GetWasmFunctionNameOrNull(isolate_, compiled_module,
|
| wasm_func_index_);
|
| }
|
|
|
| @@ -683,18 +685,15 @@ Handle<Object> AsmJsWasmStackFrame::GetFunction() const {
|
|
|
| Handle<Object> AsmJsWasmStackFrame::GetFileName() {
|
| Handle<Script> script =
|
| - wasm::GetAsmWasmScript(Handle<JSObject>::cast(wasm_instance_));
|
| + wasm::GetScript(Handle<JSObject>::cast(wasm_instance_));
|
| + DCHECK_EQ(Script::TYPE_NORMAL, script->type());
|
| return handle(script->name(), isolate_);
|
| }
|
|
|
| -Handle<Object> AsmJsWasmStackFrame::GetFunctionName() {
|
| - return wasm::GetWasmFunctionNameOrNull(isolate_, wasm_instance_,
|
| - wasm_func_index_);
|
| -}
|
| -
|
| Handle<Object> AsmJsWasmStackFrame::GetScriptNameOrSourceUrl() {
|
| Handle<Script> script =
|
| - wasm::GetAsmWasmScript(Handle<JSObject>::cast(wasm_instance_));
|
| + wasm::GetScript(Handle<JSObject>::cast(wasm_instance_));
|
| + DCHECK_EQ(Script::TYPE_NORMAL, script->type());
|
| return ScriptNameOrSourceUrl(script, isolate_);
|
| }
|
|
|
| @@ -708,14 +707,16 @@ int AsmJsWasmStackFrame::GetPosition() const {
|
| int AsmJsWasmStackFrame::GetLineNumber() {
|
| DCHECK_LE(0, GetPosition());
|
| Handle<Script> script =
|
| - wasm::GetAsmWasmScript(Handle<JSObject>::cast(wasm_instance_));
|
| + wasm::GetScript(Handle<JSObject>::cast(wasm_instance_));
|
| + DCHECK_EQ(Script::TYPE_NORMAL, script->type());
|
| return Script::GetLineNumber(script, GetPosition()) + 1;
|
| }
|
|
|
| int AsmJsWasmStackFrame::GetColumnNumber() {
|
| DCHECK_LE(0, GetPosition());
|
| Handle<Script> script =
|
| - wasm::GetAsmWasmScript(Handle<JSObject>::cast(wasm_instance_));
|
| + wasm::GetScript(Handle<JSObject>::cast(wasm_instance_));
|
| + DCHECK_EQ(Script::TYPE_NORMAL, script->type());
|
| return Script::GetColumnNumber(script, GetPosition()) + 1;
|
| }
|
|
|
|
|