Skip to content

Commit c3db581

Browse files
miladfarcatargos
authored andcommitted
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
1 parent 8ed3a3f commit c3db581

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

common.gypi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
# Reset this number to 0 on major V8 upgrades.
4040
# Increment by one for each non-official patch applied to deps/v8.
41-
'v8_embedder_string': '-node.11',
41+
'v8_embedder_string': '-node.12',
4242

4343
##### V8 defaults for Node.js #####
4444

deps/v8/src/base/memcopy.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -181,20 +181,20 @@ V8_INLINE void MemMove(void* dest, const void* src, size_t size) {
181181
}
182182

183183
#if V8_TARGET_BIG_ENDIAN
184-
inline void MemCopyAndSwitchEndianness(void* dst, void* src,
184+
inline void MemCopyAndSwitchEndianness(void* dst, const void* src,
185185
size_t num_elements,
186186
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; \
198198
}
199199

200200
switch (element_size) {

deps/v8/src/utils/memcopy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ inline void MemCopy(void* dest, const void* src, size_t size) {
3232
}
3333

3434
#if V8_TARGET_BIG_ENDIAN
35-
inline void MemCopyAndSwitchEndianness(void* dst, void* src,
35+
inline void MemCopyAndSwitchEndianness(void* dst, const void* src,
3636
size_t num_elements,
3737
size_t element_size) {
3838
v8::base::MemCopyAndSwitchEndianness(dst, src, num_elements, element_size);

0 commit comments

Comments
 (0)