diff options
| author | Ali Ijaz Sheikh <ofrobots@google.com> | 2016-05-02 16:25:42 +0200 |
|---|---|---|
| committer | Michaël Zasso <targos@protonmail.com> | 2016-06-29 10:44:27 +0200 |
| commit | c938735ceea1e610f57aff6853965a41e412299d (patch) | |
| tree | 6287cf0eb785c27cc1b4fb788a8963b3d6d73144 /src | |
| parent | 9940766f8a09c2eec06f582cbb0b4883f601be89 (diff) | |
| download | android-node-v8-c938735ceea1e610f57aff6853965a41e412299d.tar.gz android-node-v8-c938735ceea1e610f57aff6853965a41e412299d.tar.bz2 android-node-v8-c938735ceea1e610f57aff6853965a41e412299d.zip | |
dtrace: fix ustack helper for V8 5.1
V8 5.1 changes the layout of stack frames.
PR-URL: https://github.com/nodejs/node/pull/6482
Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'src')
| -rw-r--r-- | src/v8abbr.h | 4 | ||||
| -rw-r--r-- | src/v8ustack.d | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/v8abbr.h b/src/v8abbr.h index 95a04b4088..655aae40a0 100644 --- a/src/v8abbr.h +++ b/src/v8abbr.h @@ -86,8 +86,8 @@ V8_OFF_HEAP(V8DBG_CLASS_JSFUNCTION__SHARED__SHAREDFUNCTIONINFO) #define V8_OFF_SHARED_NAME \ V8_OFF_HEAP(V8DBG_CLASS_SHAREDFUNCTIONINFO__NAME__OBJECT) -#define V8_OFF_SHARED_INFERRED \ - V8_OFF_HEAP(V8DBG_CLASS_SHAREDFUNCTIONINFO__INFERRED_NAME__STRING) +#define V8_OFF_SHARED_IDENT \ + V8_OFF_HEAP(V8DBG_CLASS_SHAREDFUNCTIONINFO__FUNCTION_IDENTIFIER__OBJECT) #define V8_OFF_SHARED_SCRIPT \ V8_OFF_HEAP(V8DBG_CLASS_SHAREDFUNCTIONINFO__SCRIPT__OBJECT) #define V8_OFF_SHARED_FUNTOK \ diff --git a/src/v8ustack.d b/src/v8ustack.d index 08d06e2f2a..8faaf467ab 100644 --- a/src/v8ustack.d +++ b/src/v8ustack.d @@ -414,7 +414,7 @@ dtrace:helper:ustack: dtrace:helper:ustack: /!this->done/ { - this->marker = COPYIN_PTR(this->fp + V8_OFF_FP_MARKER); + this->marker = COPYIN_PTR(this->fp + V8_OFF_FP_CONTEXT); } dtrace:helper:ustack: @@ -532,7 +532,7 @@ dtrace:helper:ustack: APPEND_CHR('s'); APPEND_CHR(' '); - this->funcnamestr = COPYIN_PTR(this->shared + V8_OFF_SHARED_INFERRED); + this->funcnamestr = COPYIN_PTR(this->shared + V8_OFF_SHARED_IDENT); LOAD_STRFIELDS(this->funcnamestr, this->funcnamelen, this->funcnameattrs); } |