Index: src/isolate.cc |
diff --git a/src/isolate.cc b/src/isolate.cc |
index f9e87bfaba6e92d393701edc1f4037e55c4f8937..7cbf11b5fef1431d6324847c3956cdec11e9f59a 100644 |
--- a/src/isolate.cc |
+++ b/src/isolate.cc |
@@ -426,6 +426,22 @@ Handle<Object> Isolate::CaptureSimpleStackTrace(Handle<JSReceiver> error_object, |
} |
} break; |
+ case StackFrame::BUILTIN_EXIT: { |
+ BuiltinExitFrame* exit_frame = BuiltinExitFrame::cast(frame); |
+ Handle<JSFunction> fun = handle(exit_frame->function(), this); |
+ Handle<Code> code = handle(exit_frame->LookupCode(), this); |
+ int offset = |
+ static_cast<int>(exit_frame->pc() - code->instruction_start()); |
+ |
+ // For now, builtin exit frames do not pass along a receiver. |
+ elements = MaybeGrow(this, elements, cursor, cursor + 4); |
+ elements->set(cursor++, *factory()->undefined_value()); |
+ elements->set(cursor++, *fun); |
+ elements->set(cursor++, *code); |
+ elements->set(cursor++, Smi::FromInt(offset)); |
+ frames_seen++; |
+ } break; |
+ |
case StackFrame::WASM: { |
WasmFrame* wasm_frame = WasmFrame::cast(frame); |
Code* code = wasm_frame->unchecked_code(); |
@@ -601,6 +617,17 @@ class CaptureStackTraceHelper { |
return stack_frame; |
} |
+ Handle<JSObject> NewStackFrameObject(BuiltinExitFrame* frame) { |
+ Handle<JSObject> stack_frame = |
+ factory()->NewJSObject(isolate_->object_function()); |
+ Handle<JSFunction> fun = handle(frame->function(), isolate_); |
+ if (!function_key_.is_null()) { |
+ Handle<Object> fun_name = JSFunction::GetDebugName(fun); |
+ JSObject::AddProperty(stack_frame, function_key_, fun_name, NONE); |
+ } |
+ return stack_frame; |
+ } |
+ |
Handle<JSObject> NewStackFrameObject(WasmFrame* frame) { |
Handle<JSObject> stack_frame = |
factory()->NewJSObject(isolate_->object_function()); |
@@ -728,7 +755,13 @@ Handle<JSArray> Isolate::CaptureCurrentStackTrace( |
stack_trace_elems->set(frames_seen, *new_frame_obj); |
frames_seen++; |
} |
+ } else if (frame->is_builtin_exit()) { |
+ BuiltinExitFrame* exit_frame = BuiltinExitFrame::cast(frame); |
+ Handle<JSObject> new_frame_obj = helper.NewStackFrameObject(exit_frame); |
+ stack_trace_elems->set(frames_seen, *new_frame_obj); |
+ frames_seen++; |
} else { |
+ DCHECK(frame->is_wasm()); |
WasmFrame* wasm_frame = WasmFrame::cast(frame); |
Handle<JSObject> new_frame_obj = helper.NewStackFrameObject(wasm_frame); |
stack_trace_elems->set(frames_seen, *new_frame_obj); |