Skip to content

Commit 1cd235d

Browse files
committedMar 18, 2020
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: nodejs#32116 Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>
1 parent 5d867ba commit 1cd235d

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
@@ -35,7 +35,7 @@
3535

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

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

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

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

114114
AsmJsOffsetInformation::AsmJsOffsetInformation(
115115
Vector<const byte> encoded_offsets)
116-
: encoded_offsets_(OwnedVector<const uint8_t>::Of(encoded_offsets)) {}
116+
: encoded_offsets_(OwnedVector<uint8_t>::Of(encoded_offsets)) {}
117117

118118
AsmJsOffsetInformation::~AsmJsOffsetInformation() = default;
119119

0 commit comments

Comments
 (0)
Please sign in to comment.