diff options
| author | Ujjwal Sharma <usharma1998@gmail.com> | 2019-09-14 09:20:31 +0530 |
|---|---|---|
| committer | Myles Borins <mylesborins@github.com> | 2020-07-16 17:09:15 -0400 |
| commit | eac35c6061809695c737ae62b0c9fa928fd7d868 (patch) | |
| tree | 141abfa5095b92611b187999e87f434dda631e76 | |
| parent | 51d86f4b59cb7e86766871d383cad23b316ddae0 (diff) | |
| download | node-new-eac35c6061809695c737ae62b0c9fa928fd7d868.tar.gz | |
deps: patch V8 to run on older XCode versions
Patch V8 (compiler/js-heap-broker.cc) to remove the use of an optional
property, which is a fairly new C++ feature, since that requires a newer
XCode version than the minimum requirement in BUILDING.md and thus
breaks CI.
Backport-PR-URL: https://github.com/nodejs/node/pull/34356
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/compiler/js-heap-broker.cc | 1 | ||||
| -rw-r--r-- | deps/v8/src/interpreter/interpreter.cc | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/common.gypi b/common.gypi index e2de1e8833..8626acd84b 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.1', + 'v8_embedder_string': '-node.2', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/src/compiler/js-heap-broker.cc b/deps/v8/src/compiler/js-heap-broker.cc index 8ff520921f..37770f54e3 100644 --- a/deps/v8/src/compiler/js-heap-broker.cc +++ b/deps/v8/src/compiler/js-heap-broker.cc @@ -4486,6 +4486,7 @@ GlobalAccessFeedback::GlobalAccessFeedback(PropertyCellRef cell, GlobalAccessFeedback::GlobalAccessFeedback(FeedbackSlotKind slot_kind) : ProcessedFeedback(kGlobalAccess, slot_kind), + cell_or_context_(base::nullopt), index_and_immutable_(0 /* doesn't matter */) { DCHECK(IsGlobalICKind(slot_kind)); } diff --git a/deps/v8/src/interpreter/interpreter.cc b/deps/v8/src/interpreter/interpreter.cc index 42f0c56162..3927dd9e92 100644 --- a/deps/v8/src/interpreter/interpreter.cc +++ b/deps/v8/src/interpreter/interpreter.cc @@ -287,7 +287,7 @@ Interpreter::NewSourcePositionCollectionJob( auto job = std::make_unique<InterpreterCompilationJob>(parse_info, literal, allocator, nullptr); job->compilation_info()->SetBytecodeArray(existing_bytecode); - return job; + return std::unique_ptr<UnoptimizedCompilationJob> { static_cast<UnoptimizedCompilationJob*>(job.release()) }; } void Interpreter::ForEachBytecode( |