Skip to content

Commit dd99628

Browse files
mmarchinitargos
authored andcommitted
deps: patch V8 to run on Xcode 8
Patch V8 (wasm/wasm-module.cc) to remove const qualifier from type passed to template call of `OwnedVector::Of`. Xcode 8 can't convert 'OwnedVector<unsigned char>' to 'OwnedVector<const unsigned char>' when returning from a function (which is likely a bug on Xcode, considering this worked on the prior version of Xcode as well as newer versions). This workaround shouldn't affect the application, since the const qualifier is preserved in the AsmJsOffsetInformation::encoded_offset_. There's also a V8 test passing a const-qualified type to ::Of, but since we don't test V8 on Xcode 8, it should be fine to leave it as is. Signed-off-by: Matheus Marchini <[email protected]> PR-URL: #32116 Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>
1 parent 22be529 commit dd99628

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

common.gypi

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

3737
# Reset this number to 0 on major V8 upgrades.
3838
# Increment by one for each non-official patch applied to deps/v8.
39-
'v8_embedder_string': '-node.5',
39+
'v8_embedder_string': '-node.6',
4040

4141
##### V8 defaults for Node.js #####
4242

deps/v8/src/wasm/wasm-module.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ void LazilyGeneratedNames::AddForTesting(int function_index,
116116

117117
AsmJsOffsetInformation::AsmJsOffsetInformation(
118118
Vector<const byte> encoded_offsets)
119-
: encoded_offsets_(OwnedVector<const uint8_t>::Of(encoded_offsets)) {}
119+
: encoded_offsets_(OwnedVector<uint8_t>::Of(encoded_offsets)) {}
120120

121121
AsmJsOffsetInformation::~AsmJsOffsetInformation() = default;
122122

0 commit comments

Comments
 (0)