Commit 2e8652e
src: fix SmartOS compilation
Refs: nodejs/node-v8#8
Backport-PR-URL: #15393
PR-URL: #14730
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>1 parent c0b5b09 commit 2e8652e
2 files changed
Lines changed: 19 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -85,14 +85,14 @@ | |||
| 85 | 85 | ||
| 86 | 86 | #define V8_OFF_FUNC_SHARED \ | |
| 87 | 87 | V8_OFF_HEAP(V8DBG_CLASS_JSFUNCTION__SHARED__SHAREDFUNCTIONINFO) | |
| 88 | - #define V8_OFF_SHARED_NAME \ | ||
| 89 | - V8_OFF_HEAP(V8DBG_CLASS_SHAREDFUNCTIONINFO__NAME__OBJECT) | ||
| 88 | + #define V8_OFF_RAW_NAME \ | ||
| 89 | + V8_OFF_HEAP(V8DBG_CLASS_SHAREDFUNCTIONINFO__RAW_NAME__OBJECT) | ||
| 90 | 90 | #define V8_OFF_SHARED_IDENT \ | |
| 91 | 91 | V8_OFF_HEAP(V8DBG_CLASS_SHAREDFUNCTIONINFO__FUNCTION_IDENTIFIER__OBJECT) | |
| 92 | 92 | #define V8_OFF_SHARED_SCRIPT \ | |
| 93 | 93 | V8_OFF_HEAP(V8DBG_CLASS_SHAREDFUNCTIONINFO__SCRIPT__OBJECT) | |
| 94 | 94 | #define V8_OFF_SHARED_FUNTOK \ | |
| 95 | - V8_OFF_HEAP(V8DBG_CLASS_SHAREDFUNCTIONINFO__FUNCTION_TOKEN_POSITION__SMI) | ||
| 95 | + V8_OFF_HEAP(V8DBG_CLASS_SHAREDFUNCTIONINFO__FUNCTION_TOKEN_POSITION__INT) | ||
| 96 | 96 | #define V8_OFF_SCRIPT_NAME \ | |
| 97 | 97 | V8_OFF_HEAP(V8DBG_CLASS_SCRIPT__NAME__OBJECT) | |
| 98 | 98 | #define V8_OFF_SCRIPT_LENDS \ | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -21,6 +21,7 @@ | |||
| 21 | 21 | ((value & V8_SmiTagMask) == V8_SmiTag) | |
| 22 | 22 | #define SMI_VALUE(value) \ | |
| 23 | 23 | ((uint32_t) ((value) >> V8_SmiValueShift)) | |
| 24 | + #define NO_SHARED_FUNCTION_NAME_SENTINEL NULL | ||
| 24 | 25 | ||
| 25 | 26 | /* | |
| 26 | 27 | * Heap objects usually start off with a Map pointer, itself another heap | |
@@ -372,7 +373,8 @@ dtrace:helper:ustack: | |||
| 372 | 373 | this->shared = (off_t) 0; | |
| 373 | 374 | this->map = (off_t) 0; | |
| 374 | 375 | this->attrs = 0; | |
| 375 | - this->funcnamestr = (off_t) 0; | ||
| 376 | + this->funcrawnamestr = (off_t) 0; | ||
| 377 | + this->hassharedname = 0; | ||
| 376 | 378 | this->funcnamelen = 0; | |
| 377 | 379 | this->funcnameattrs = 0; | |
| 378 | 380 | this->script = (off_t) 0; | |
@@ -515,9 +517,16 @@ dtrace:helper:ustack: | |||
| 515 | 517 | this->attrs = 0; | |
| 516 | 518 | ||
| 517 | 519 | this->shared = COPYIN_PTR(this->func + V8_OFF_FUNC_SHARED); | |
| 518 | - this->funcnamestr = COPYIN_PTR(this->shared + V8_OFF_SHARED_NAME); | ||
| 519 | - LOAD_STRFIELDS(this->funcnamestr, this->funcnamelen, | ||
| 520 | - this->funcnameattrs); | ||
| 520 | + this->funcrawnamestr = COPYIN_PTR(this->shared + V8_OFF_RAW_NAME); | ||
| 521 | + this->hassharedname = this->funcrawnamestr != | ||
| 522 | + NO_SHARED_FUNCTION_NAME_SENTINEL; | ||
| 523 | + } | ||
| 524 | + | ||
| 525 | + dtracr:helper:ustack: | ||
| 526 | + /!this->done && this->hassharedname/ | ||
| 527 | + { | ||
| 528 | + LOAD_STRFIELDS(this->funcrawnamestr, this->funcnamelen, | ||
| 529 | + this->funcnameattrs); | ||
| 521 | 530 | } | |
| 522 | 531 | ||
| 523 | 532 | dtrace:helper:ustack: | |
@@ -532,8 +541,8 @@ dtrace:helper:ustack: | |||
| 532 | 541 | APPEND_CHR('s'); | |
| 533 | 542 | APPEND_CHR(' '); | |
| 534 | 543 | ||
| 535 | - this->funcnamestr = COPYIN_PTR(this->shared + V8_OFF_SHARED_IDENT); | ||
| 536 | - LOAD_STRFIELDS(this->funcnamestr, this->funcnamelen, | ||
| 544 | + this->funcrawnamestr = COPYIN_PTR(this->shared + V8_OFF_SHARED_IDENT); | ||
| 545 | + LOAD_STRFIELDS(this->funcrawnamestr, this->funcnamelen, | ||
| 537 | 546 | this->funcnameattrs); | |
| 538 | 547 | } | |
| 539 | 548 | ||
@@ -545,7 +554,7 @@ dtrace:helper:ustack: | |||
| 545 | 554 | APPEND_CHR(')'); | |
| 546 | 555 | } | |
| 547 | 556 | ||
| 548 | - APPEND_V8STR(this->funcnamestr, this->funcnamelen, this->funcnameattrs) | ||
| 557 | + APPEND_V8STR(this->funcrawnamestr, this->funcnamelen, this->funcnameattrs) | ||
| 549 | 558 | ||
| 550 | 559 | /* | |
| 551 | 560 | * Now look for the name of the script where the function was defined. The | |
0 commit comments