Commit d7eccac
deps: V8: cherry-pick daf4656ba85e
Original commit message:
Mark MemCopyAndSwitchEndianness src input as `const`
Needed after this CL: http://crrev.com/c/7600437
Currently getting the following error:
```
candidate function not viable: no known conversion from 'const unsigned char *' to 'void *'
```
Change-Id: I0c0f065b822e0f95ffd06207d280fc8b7bab4403
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/7601332
Reviewed-by: Clemens Backes <clemensb@chromium.org>
Commit-Queue: Milad Farazmand <mfarazma@ibm.com>
Cr-Commit-Position: refs/heads/main@{#105413}
Refs: v8/v8@daf4656
PR-URL: #61898
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
(cherry picked from commit e6f9cd5)1 parent 3ee1ea7 commit d7eccac
3 files changed
Lines changed: 14 additions & 14 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -38,7 +38,7 @@ | |||
| 38 | 38 | ||
| 39 | 39 | # Reset this number to 0 on major V8 upgrades. | |
| 40 | 40 | # Increment by one for each non-official patch applied to deps/v8. | |
| 41 | - 'v8_embedder_string': '-node.10', | ||
| 41 | + 'v8_embedder_string': '-node.11', | ||
| 42 | 42 | ||
| 43 | 43 | ##### V8 defaults for Node.js ##### | |
| 44 | 44 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -181,20 +181,20 @@ V8_INLINE void MemMove(void* dest, const void* src, size_t size) { | |||
| 181 | 181 | } | |
| 182 | 182 | ||
| 183 | 183 | #if V8_TARGET_BIG_ENDIAN | |
| 184 | - inline void MemCopyAndSwitchEndianness(void* dst, void* src, | ||
| 184 | + inline void MemCopyAndSwitchEndianness(void* dst, const void* src, | ||
| 185 | 185 | size_t num_elements, | |
| 186 | 186 | size_t element_size) { | |
| 187 | - #define COPY_LOOP(type, reverse) \ | ||
| 188 | - { \ | ||
| 189 | - for (uint32_t i = 0; i < num_elements; i++) { \ | ||
| 190 | - type t; \ | ||
| 191 | - type* s = reinterpret_cast<type*>(src) + i; \ | ||
| 192 | - type* d = reinterpret_cast<type*>(dst) + i; \ | ||
| 193 | - memcpy(&t, reinterpret_cast<void*>(s), element_size); \ | ||
| 194 | - t = reverse(t); \ | ||
| 195 | - memcpy(reinterpret_cast<void*>(d), &t, element_size); \ | ||
| 196 | - } \ | ||
| 197 | - return; \ | ||
| 187 | + #define COPY_LOOP(type, reverse) \ | ||
| 188 | + { \ | ||
| 189 | + for (uint32_t i = 0; i < num_elements; i++) { \ | ||
| 190 | + type t; \ | ||
| 191 | + const type* s = reinterpret_cast<const type*>(src) + i; \ | ||
| 192 | + type* d = reinterpret_cast<type*>(dst) + i; \ | ||
| 193 | + memcpy(&t, reinterpret_cast<const void*>(s), element_size); \ | ||
| 194 | + t = reverse(t); \ | ||
| 195 | + memcpy(reinterpret_cast<void*>(d), &t, element_size); \ | ||
| 196 | + } \ | ||
| 197 | + return; \ | ||
| 198 | 198 | } | |
| 199 | 199 | ||
| 200 | 200 | switch (element_size) { | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -32,7 +32,7 @@ inline void MemCopy(void* dest, const void* src, size_t size) { | |||
| 32 | 32 | } | |
| 33 | 33 | ||
| 34 | 34 | #if V8_TARGET_BIG_ENDIAN | |
| 35 | - inline void MemCopyAndSwitchEndianness(void* dst, void* src, | ||
| 35 | + inline void MemCopyAndSwitchEndianness(void* dst, const void* src, | ||
| 36 | 36 | size_t num_elements, | |
| 37 | 37 | size_t element_size) { | |
| 38 | 38 | v8::base::MemCopyAndSwitchEndianness(dst, src, num_elements, element_size); | |
0 commit comments