Merge V8 5.2.361.47 DO NOT MERGE
https://chromium.googlesource.com/v8/v8/+/5.2.361.47
FPIIM-449
Change-Id: Ibec421b85a9b88cb3a432ada642e469fe7e78346
(cherry picked from commit bcf72ee8e3b26f1d0726869c7ddb3921c68b09a8)
diff --git a/src/frames-inl.h b/src/frames-inl.h
index 5ecbd45..998be23 100644
--- a/src/frames-inl.h
+++ b/src/frames-inl.h
@@ -199,11 +199,6 @@
}
-inline Object* JavaScriptFrame::receiver() const {
- return GetParameter(-1);
-}
-
-
inline void JavaScriptFrame::set_receiver(Object* value) {
Memory::Object_at(GetParameterSlot(-1)) = value;
}
@@ -214,11 +209,6 @@
}
-inline JSFunction* JavaScriptFrame::function() const {
- return JSFunction::cast(function_slot_object());
-}
-
-
inline Object* JavaScriptFrame::function_slot_object() const {
const int offset = JavaScriptFrameConstants::kFunctionOffset;
return Memory::Object_at(fp() + offset);
@@ -288,6 +278,28 @@
return static_cast<JavaScriptFrame*>(frame);
}
+inline StandardFrame* StackTraceFrameIterator::frame() const {
+ StackFrame* frame = iterator_.frame();
+ DCHECK(frame->is_java_script() || frame->is_arguments_adaptor() ||
+ frame->is_wasm());
+ return static_cast<StandardFrame*>(frame);
+}
+
+bool StackTraceFrameIterator::is_javascript() const {
+ return frame()->is_java_script();
+}
+
+bool StackTraceFrameIterator::is_wasm() const { return frame()->is_wasm(); }
+
+JavaScriptFrame* StackTraceFrameIterator::javascript_frame() const {
+ DCHECK(is_javascript());
+ return static_cast<JavaScriptFrame*>(frame());
+}
+
+WasmFrame* StackTraceFrameIterator::wasm_frame() const {
+ DCHECK(is_wasm());
+ return static_cast<WasmFrame*>(frame());
+}
inline StackFrame* SafeStackFrameIterator::frame() const {
DCHECK(!done());