Commit c10cde19 authored by mmoroz's avatar mmoroz Committed by Commit bot

Correctly annotate v8::StackTrace and v8::StackFrame API methods

BUG=v8:5830

Review-Url: https://codereview.chromium.org/2761293002
Cr-Commit-Position: refs/heads/master@{#44101}
parent 4693a433
...@@ -2841,7 +2841,7 @@ void Message::PrintCurrentStackTrace(Isolate* isolate, FILE* out) { ...@@ -2841,7 +2841,7 @@ void Message::PrintCurrentStackTrace(Isolate* isolate, FILE* out) {
Local<StackFrame> StackTrace::GetFrame(uint32_t index) const { Local<StackFrame> StackTrace::GetFrame(uint32_t index) const {
i::Isolate* isolate = Utils::OpenHandle(this)->GetIsolate(); i::Isolate* isolate = Utils::OpenHandle(this)->GetIsolate();
ENTER_V8(isolate); ENTER_V8_NO_SCRIPT_NO_EXCEPTION(isolate);
EscapableHandleScope scope(reinterpret_cast<Isolate*>(isolate)); EscapableHandleScope scope(reinterpret_cast<Isolate*>(isolate));
auto self = Utils::OpenHandle(this); auto self = Utils::OpenHandle(this);
auto obj = i::JSReceiver::GetElement(isolate, self, index).ToHandleChecked(); auto obj = i::JSReceiver::GetElement(isolate, self, index).ToHandleChecked();
...@@ -2865,10 +2865,7 @@ Local<StackTrace> StackTrace::CurrentStackTrace( ...@@ -2865,10 +2865,7 @@ Local<StackTrace> StackTrace::CurrentStackTrace(
int frame_limit, int frame_limit,
StackTraceOptions options) { StackTraceOptions options) {
i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate); i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate);
ENTER_V8(i_isolate); ENTER_V8_NO_SCRIPT_NO_EXCEPTION(i_isolate);
// TODO(dcarney): remove when ScriptDebugServer is fixed.
options = static_cast<StackTraceOptions>(
static_cast<int>(options) | kExposeFramesAcrossSecurityOrigins);
i::Handle<i::JSArray> stackTrace = i::Handle<i::JSArray> stackTrace =
i_isolate->CaptureCurrentStackTrace(frame_limit, options); i_isolate->CaptureCurrentStackTrace(frame_limit, options);
return Utils::StackTraceToLocal(stackTrace); return Utils::StackTraceToLocal(stackTrace);
...@@ -2880,7 +2877,7 @@ Local<StackTrace> StackTrace::CurrentStackTrace( ...@@ -2880,7 +2877,7 @@ Local<StackTrace> StackTrace::CurrentStackTrace(
static int getIntProperty(const StackFrame* f, const char* propertyName, static int getIntProperty(const StackFrame* f, const char* propertyName,
int defaultValue) { int defaultValue) {
i::Isolate* isolate = Utils::OpenHandle(f)->GetIsolate(); i::Isolate* isolate = Utils::OpenHandle(f)->GetIsolate();
ENTER_V8(isolate); ENTER_V8_NO_SCRIPT_NO_EXCEPTION(isolate);
i::HandleScope scope(isolate); i::HandleScope scope(isolate);
i::Handle<i::JSObject> self = Utils::OpenHandle(f); i::Handle<i::JSObject> self = Utils::OpenHandle(f);
i::Handle<i::Object> obj = i::Handle<i::Object> obj =
...@@ -2907,7 +2904,7 @@ int StackFrame::GetScriptId() const { ...@@ -2907,7 +2904,7 @@ int StackFrame::GetScriptId() const {
static Local<String> getStringProperty(const StackFrame* f, static Local<String> getStringProperty(const StackFrame* f,
const char* propertyName) { const char* propertyName) {
i::Isolate* isolate = Utils::OpenHandle(f)->GetIsolate(); i::Isolate* isolate = Utils::OpenHandle(f)->GetIsolate();
ENTER_V8(isolate); ENTER_V8_NO_SCRIPT_NO_EXCEPTION(isolate);
EscapableHandleScope scope(reinterpret_cast<Isolate*>(isolate)); EscapableHandleScope scope(reinterpret_cast<Isolate*>(isolate));
i::Handle<i::JSObject> self = Utils::OpenHandle(f); i::Handle<i::JSObject> self = Utils::OpenHandle(f);
i::Handle<i::Object> obj = i::Handle<i::Object> obj =
...@@ -2935,7 +2932,7 @@ Local<String> StackFrame::GetFunctionName() const { ...@@ -2935,7 +2932,7 @@ Local<String> StackFrame::GetFunctionName() const {
static bool getBoolProperty(const StackFrame* f, const char* propertyName) { static bool getBoolProperty(const StackFrame* f, const char* propertyName) {
i::Isolate* isolate = Utils::OpenHandle(f)->GetIsolate(); i::Isolate* isolate = Utils::OpenHandle(f)->GetIsolate();
ENTER_V8(isolate); ENTER_V8_NO_SCRIPT_NO_EXCEPTION(isolate);
i::HandleScope scope(isolate); i::HandleScope scope(isolate);
i::Handle<i::JSObject> self = Utils::OpenHandle(f); i::Handle<i::JSObject> self = Utils::OpenHandle(f);
i::Handle<i::Object> obj = i::Handle<i::Object> obj =
......
...@@ -19,7 +19,8 @@ static const v8::StackTrace::StackTraceOptions stackTraceOptions = ...@@ -19,7 +19,8 @@ static const v8::StackTrace::StackTraceOptions stackTraceOptions =
static_cast<v8::StackTrace::StackTraceOptions>( static_cast<v8::StackTrace::StackTraceOptions>(
v8::StackTrace::kLineNumber | v8::StackTrace::kColumnOffset | v8::StackTrace::kLineNumber | v8::StackTrace::kColumnOffset |
v8::StackTrace::kScriptId | v8::StackTrace::kScriptNameOrSourceURL | v8::StackTrace::kScriptId | v8::StackTrace::kScriptNameOrSourceURL |
v8::StackTrace::kFunctionName); v8::StackTrace::kFunctionName |
v8::StackTrace::kExposeFramesAcrossSecurityOrigins);
V8StackTraceImpl::Frame toFrame(v8::Local<v8::StackFrame> frame, V8StackTraceImpl::Frame toFrame(v8::Local<v8::StackFrame> frame,
WasmTranslation* wasmTranslation, WasmTranslation* wasmTranslation,
......
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