Chromium Code Reviews| Index: src/isolate.cc |
| diff --git a/src/isolate.cc b/src/isolate.cc |
| index 4f9e435991090cf87c9c7b98c1934fde9cf0dc0a..ef0feead3ea877e4ce44fca72b4ccdf63a9f635d 100644 |
| --- a/src/isolate.cc |
| +++ b/src/isolate.cc |
| @@ -510,7 +510,7 @@ Handle<Object> Isolate::CaptureSimpleStackTrace(Handle<JSReceiver> error_object, |
| case StackFrame::WASM: { |
| WasmFrame* wasm_frame = WasmFrame::cast(frame); |
| - Handle<Object> wasm_object(wasm_frame->wasm_obj(), this); |
| + Handle<Object> instance(wasm_frame->wasm_obj(), this); |
|
Mircea Trofin
2016/10/19 05:28:55
I really wish the renames (while super-welcome) ca
titzer
2016/10/19 09:54:41
Renaming split out to: https://codereview.chromium
|
| const int wasm_function_index = wasm_frame->function_index(); |
| Code* code = wasm_frame->unchecked_code(); |
| Handle<AbstractCode> abstract_code(AbstractCode::cast(code), this); |
| @@ -519,16 +519,15 @@ Handle<Object> Isolate::CaptureSimpleStackTrace(Handle<JSReceiver> error_object, |
| // TODO(wasm): The wasm object returned by the WasmFrame should always |
| // be a wasm object. |
| - DCHECK(wasm::IsWasmObject(*wasm_object) || |
| - wasm_object->IsUndefined(this)); |
| + DCHECK(wasm::IsWasmInstance(*instance) || instance->IsUndefined(this)); |
| - int flags = wasm::WasmIsAsmJs(*wasm_object, this) |
| + int flags = wasm::WasmIsAsmJs(*instance, this) |
| ? FrameArray::kIsAsmJsWasmFrame |
| : FrameArray::kIsWasmFrame; |
| - elements = FrameArray::AppendWasmFrame(elements, wasm_object, |
| - wasm_function_index, |
| - abstract_code, offset, flags); |
| + elements = |
| + FrameArray::AppendWasmFrame(elements, instance, wasm_function_index, |
| + abstract_code, offset, flags); |
| } break; |
| default: |