Skip to content

Commit 4182e3b

Browse files
ryzokukenMylesBorins
authored andcommitted
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: #30513 PR-URL: #29694 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Gus Caplan <[email protected]> Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Ujjwal Sharma <[email protected]>
1 parent 6566c15 commit 4182e3b

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

common.gypi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
# Reset this number to 0 on major V8 upgrades.
4141
# Increment by one for each non-official patch applied to deps/v8.
42-
'v8_embedder_string': '-node.2',
42+
'v8_embedder_string': '-node.3',
4343

4444
##### V8 defaults for Node.js #####
4545

deps/v8/src/compiler/js-heap-broker.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4203,6 +4203,7 @@ GlobalAccessFeedback::GlobalAccessFeedback(PropertyCellRef cell,
42034203

42044204
GlobalAccessFeedback::GlobalAccessFeedback(FeedbackSlotKind slot_kind)
42054205
: ProcessedFeedback(kGlobalAccess, slot_kind),
4206+
cell_or_context_(base::nullopt),
42064207
index_and_immutable_(0 /* doesn't matter */) {
42074208
DCHECK(IsGlobalICKind(slot_kind));
42084209
}

deps/v8/src/interpreter/interpreter.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ Interpreter::NewSourcePositionCollectionJob(
280280
auto job = std::make_unique<InterpreterCompilationJob>(parse_info, literal,
281281
allocator, nullptr);
282282
job->compilation_info()->SetBytecodeArray(existing_bytecode);
283-
return job;
283+
return std::unique_ptr<UnoptimizedCompilationJob> { static_cast<UnoptimizedCompilationJob*>(job.release()) };
284284
}
285285

286286
void Interpreter::ForEachBytecode(

0 commit comments

Comments
 (0)