Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(77)

Unified Diff: src/isolate.cc

Issue 2090723005: [builtins] New frame type for exits to C++ builtins (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Add missing condition in SafeStackFrameIter::frame() Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/ia32/macro-assembler-ia32.cc ('k') | src/mips/builtins-mips.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/isolate.cc
diff --git a/src/isolate.cc b/src/isolate.cc
index 4bc865bfe14e2d57661d9020d6710100808751d7..ac6504ac458771a15cd70079fd47e4c6501f8fe3 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,21 @@ 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);
+ }
+
+ // We don't have a script and hence cannot set line and col positions.
+ DCHECK(!fun->shared()->script()->IsScript());
+
+ return stack_frame;
+ }
+
Handle<JSObject> NewStackFrameObject(WasmFrame* frame) {
Handle<JSObject> stack_frame =
factory()->NewJSObject(isolate_->object_function());
@@ -729,6 +760,7 @@ Handle<JSArray> Isolate::CaptureCurrentStackTrace(
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);
« no previous file with comments | « src/ia32/macro-assembler-ia32.cc ('k') | src/mips/builtins-mips.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698