Skip to content

Commit 335e386

Browse files
mmarchiniMylesBorins
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: #34356 PR-URL: #32116 Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>
1 parent 355e2f2 commit 335e386

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.6',
39+
'v8_embedder_string': '-node.7',
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
@@ -134,7 +134,7 @@ void LazilyGeneratedNames::AddForTesting(int function_index,
134134

135135
AsmJsOffsetInformation::AsmJsOffsetInformation(
136136
Vector<const byte> encoded_offsets)
137-
: encoded_offsets_(OwnedVector<const uint8_t>::Of(encoded_offsets)) {}
137+
: encoded_offsets_(OwnedVector<uint8_t>::Of(encoded_offsets)) {}
138138

139139
AsmJsOffsetInformation::~AsmJsOffsetInformation() = default;
140140

0 commit comments

Comments
 (0)