Skip to content

Commit 883840b

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]> Backport-PR-URL: #33376 PR-URL: #32831 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
1 parent 3831a54 commit 883840b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

common.gypi

+1-1
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.7',
39+
'v8_embedder_string': '-node.8',
4040

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ void DecodedFunctionNames::AddForTesting(int function_index,
129129

130130
AsmJsOffsetInformation::AsmJsOffsetInformation(
131131
Vector<const byte> encoded_offsets)
132-
: encoded_offsets_(OwnedVector<const uint8_t>::Of(encoded_offsets)) {}
132+
: encoded_offsets_(OwnedVector<uint8_t>::Of(encoded_offsets)) {}
133133

134134
AsmJsOffsetInformation::~AsmJsOffsetInformation() = default;
135135

0 commit comments

Comments
 (0)