diff options
| author | Matheus Marchini <mmarchini@netflix.com> | 2020-03-11 02:58:15 +0300 |
|---|---|---|
| committer | Michaël Zasso <targos@protonmail.com> | 2020-10-18 21:17:09 +0300 |
| commit | a86521abf69fbeb46ff0c791bfe54a473d409a1e (patch) | |
| tree | 13abd502e4659a41e83945e61edb1a27e4e5363f | |
| parent | 3937dff03143bc70f63e807f4e58e70728b14b43 (diff) | |
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 <mmarchini@netflix.com>
PR-URL: https://github.com/nodejs/node/pull/32116
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
| -rw-r--r-- | common.gypi | 2 | ||||
| -rw-r--r-- | deps/v8/src/wasm/wasm-module.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/common.gypi b/common.gypi index 80cb4f44ede..3a5e7fb2cfe 100644 --- a/common.gypi +++ b/common.gypi @@ -36,7 +36,7 @@ # Reset this number to 0 on major V8 upgrades. # Increment by one for each non-official patch applied to deps/v8. - 'v8_embedder_string': '-node.6', + 'v8_embedder_string': '-node.7', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/src/wasm/wasm-module.cc b/deps/v8/src/wasm/wasm-module.cc index d3c0b6786ab..37d0c48a469 100644 --- a/deps/v8/src/wasm/wasm-module.cc +++ b/deps/v8/src/wasm/wasm-module.cc @@ -137,7 +137,7 @@ void LazilyGeneratedNames::AddForTesting(int function_index, AsmJsOffsetInformation::AsmJsOffsetInformation( Vector<const byte> encoded_offsets) - : encoded_offsets_(OwnedVector<const uint8_t>::Of(encoded_offsets)) {} + : encoded_offsets_(OwnedVector<uint8_t>::Of(encoded_offsets)) {} AsmJsOffsetInformation::~AsmJsOffsetInformation() = default; |