Commit d422dc74 authored by Peter Marshall's avatar Peter Marshall Committed by Commit Bot

[cpu-profiler] Allow wasm to js frames in SafeStackFrameIterator::frame

SafeStackFrameIterator::Advance() will stop at wasm_to_js frames, so we
should fully expect that they show up when calling frame() after
Advance().

This fixes some breakages for profiling wasm and asm.js.

Bug: chromium:1010534, v8:10150
Change-Id: Ifc78cd9eba33e777b33fc1cbea19ee376b25299c
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2019485Reviewed-by: 's avatarClemens Backes <clemensb@chromium.org>
Commit-Queue: Peter Marshall <petermarshall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#65980}
parent 513fb367
......@@ -307,7 +307,8 @@ JavaScriptFrame* StackTraceFrameIterator::javascript_frame() const {
inline StackFrame* SafeStackFrameIterator::frame() const {
DCHECK(!done());
DCHECK(frame_->is_java_script() || frame_->is_exit() ||
frame_->is_builtin_exit() || frame_->is_wasm());
frame_->is_builtin_exit() || frame_->is_wasm() ||
frame_->is_wasm_to_js());
return frame_;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment