Commit 9478f29
committed
src: use StackFrame::GetFrame with isolate
PR-URL: #22531
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent 3dc9cfc commit 9478f29
2 files changed
Lines changed: 4 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -320,7 +320,7 @@ void Environment::PrintSyncTrace() const { | |||
| 320 | 320 | uv_os_getpid()); | |
| 321 | 321 | ||
| 322 | 322 | for (int i = 0; i < stack->GetFrameCount() - 1; i++) { | |
| 323 | - Local<StackFrame> stack_frame = stack->GetFrame(i); | ||
| 323 | + Local<StackFrame> stack_frame = stack->GetFrame(isolate(), i); | ||
| 324 | 324 | node::Utf8Value fn_name_s(isolate(), stack_frame->GetFunctionName()); | |
| 325 | 325 | node::Utf8Value script_name(isolate(), stack_frame->GetScriptName()); | |
| 326 | 326 | const int line_number = stack_frame->GetLineNumber(); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -476,22 +476,20 @@ class NodeInspectorClient : public V8InspectorClient { | |||
| 476 | 476 | } | |
| 477 | 477 | ||
| 478 | 478 | void FatalException(Local<Value> error, Local<v8::Message> message) { | |
| 479 | + Isolate* isolate = env_->isolate(); | ||
| 479 | 480 | Local<Context> context = env_->context(); | |
| 480 | 481 | ||
| 481 | 482 | int script_id = message->GetScriptOrigin().ScriptID()->Value(); | |
| 482 | 483 | ||
| 483 | 484 | Local<v8::StackTrace> stack_trace = message->GetStackTrace(); | |
| 484 | 485 | ||
| 485 | - if (!stack_trace.IsEmpty() && | ||
| 486 | - stack_trace->GetFrameCount() > 0 && | ||
| 487 | - script_id == stack_trace->GetFrame(0)->GetScriptId()) { | ||
| 486 | + if (!stack_trace.IsEmpty() && stack_trace->GetFrameCount() > 0 && | ||
| 487 | + script_id == stack_trace->GetFrame(isolate, 0)->GetScriptId()) { | ||
| 488 | 488 | script_id = 0; | |
| 489 | 489 | } | |
| 490 | 490 | ||
| 491 | 491 | const uint8_t DETAILS[] = "Uncaught"; | |
| 492 | 492 | ||
| 493 | - Isolate* isolate = context->GetIsolate(); | ||
| 494 | - | ||
| 495 | 493 | client_->exceptionThrown( | |
| 496 | 494 | context, | |
| 497 | 495 | StringView(DETAILS, sizeof(DETAILS) - 1), | |
0 commit comments