Skip to content

Commit 098d365

Browse files
committed
dtrace: fix ustack helper for V8 5.1
V8 5.1 changes the layout of stack frames. PR-URL: #6482 Reviewed-By: bnoordhuis - Ben Noordhuis <[email protected]>
1 parent a784d6f commit 098d365

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/v8abbr.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@
8686
V8_OFF_HEAP(V8DBG_CLASS_JSFUNCTION__SHARED__SHAREDFUNCTIONINFO)
8787
#define V8_OFF_SHARED_NAME \
8888
V8_OFF_HEAP(V8DBG_CLASS_SHAREDFUNCTIONINFO__NAME__OBJECT)
89-
#define V8_OFF_SHARED_INFERRED \
90-
V8_OFF_HEAP(V8DBG_CLASS_SHAREDFUNCTIONINFO__INFERRED_NAME__STRING)
89+
#define V8_OFF_SHARED_IDENT \
90+
V8_OFF_HEAP(V8DBG_CLASS_SHAREDFUNCTIONINFO__FUNCTION_IDENTIFIER__OBJECT)
9191
#define V8_OFF_SHARED_SCRIPT \
9292
V8_OFF_HEAP(V8DBG_CLASS_SHAREDFUNCTIONINFO__SCRIPT__OBJECT)
9393
#define V8_OFF_SHARED_FUNTOK \

src/v8ustack.d

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ dtrace:helper:ustack:
414414
dtrace:helper:ustack:
415415
/!this->done/
416416
{
417-
this->marker = COPYIN_PTR(this->fp + V8_OFF_FP_MARKER);
417+
this->marker = COPYIN_PTR(this->fp + V8_OFF_FP_CONTEXT);
418418
}
419419

420420
dtrace:helper:ustack:
@@ -532,7 +532,7 @@ dtrace:helper:ustack:
532532
APPEND_CHR('s');
533533
APPEND_CHR(' ');
534534

535-
this->funcnamestr = COPYIN_PTR(this->shared + V8_OFF_SHARED_INFERRED);
535+
this->funcnamestr = COPYIN_PTR(this->shared + V8_OFF_SHARED_IDENT);
536536
LOAD_STRFIELDS(this->funcnamestr, this->funcnamelen,
537537
this->funcnameattrs);
538538
}

0 commit comments

Comments
 (0)