Commit 8eeecc1
committed
deps: V8: cherry-pick 8957d4677aa7
Original commit message:
[aarm64] Fix GetSharedLibraryAddresses
This patch fixes a segmentation fault which occurs when using `--prof` flag on a Darwin ARM64 architecture.
See #36656
Change-Id: Idc3ce6c8fd8a24f76f1b356f629e37340045b51e
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2609413
Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
Reviewed-by: Michael Lippautz <mlippautz@chromium.org>
Commit-Queue: Ulan Degenbaev <ulan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#72886}
Refs: v8/v8@8957d46
PR-URL: #37330
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>1 parent b186142 commit 8eeecc1
3 files changed
Lines changed: 6 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -36,7 +36,7 @@ | |||
| 36 | 36 | ||
| 37 | 37 | # Reset this number to 0 on major V8 upgrades. | |
| 38 | 38 | # Increment by one for each non-official patch applied to deps/v8. | |
| 39 | - 'v8_embedder_string': '-node.14', | ||
| 39 | + 'v8_embedder_string': '-node.15', | ||
| 40 | 40 | ||
| 41 | 41 | ##### V8 defaults for Node.js ##### | |
| 42 | 42 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -60,6 +60,7 @@ Andreas Anyuru <andreas.anyuru@gmail.com> | |||
| 60 | 60 | Andrew Paprocki <andrew@ishiboo.com> | |
| 61 | 61 | Andrei Kashcha <anvaka@gmail.com> | |
| 62 | 62 | Anna Henningsen <anna@addaleax.net> | |
| 63 | + Antoine du Hamel <duhamelantoine1995@gmail.com> | ||
| 63 | 64 | Anton Bikineev <ant.bikineev@gmail.com> | |
| 64 | 65 | Bangfu Tao <bangfu.tao@samsung.com> | |
| 65 | 66 | Daniel Shelton <d1.shelton@samsung.com> | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -49,14 +49,14 @@ std::vector<OS::SharedLibraryAddress> OS::GetSharedLibraryAddresses() { | |||
| 49 | 49 | for (unsigned int i = 0; i < images_count; ++i) { | |
| 50 | 50 | const mach_header* header = _dyld_get_image_header(i); | |
| 51 | 51 | if (header == nullptr) continue; | |
| 52 | - #if V8_HOST_ARCH_X64 | ||
| 52 | + #if V8_HOST_ARCH_I32 | ||
| 53 | + unsigned int size; | ||
| 54 | + char* code_ptr = getsectdatafromheader(header, SEG_TEXT, SECT_TEXT, &size); | ||
| 55 | + #else | ||
| 53 | 56 | uint64_t size; | |
| 54 | 57 | char* code_ptr = getsectdatafromheader_64( | |
| 55 | 58 | reinterpret_cast<const mach_header_64*>(header), SEG_TEXT, SECT_TEXT, | |
| 56 | 59 | &size); | |
| 57 | - #else | ||
| 58 | - unsigned int size; | ||
| 59 | - char* code_ptr = getsectdatafromheader(header, SEG_TEXT, SECT_TEXT, &size); | ||
| 60 | 60 | #endif | |
| 61 | 61 | if (code_ptr == nullptr) continue; | |
| 62 | 62 | const intptr_t slide = _dyld_get_image_vmaddr_slide(i); | |
0 commit comments