Skip to content

Commit 6a6b31b

Browse files
ryzokukennodejs-ci
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. PR-URL: nodejs/node#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 7821f36 commit 6a6b31b

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

common.gypi

+1-1
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

+1
Original file line numberDiff line numberDiff line change
@@ -4451,6 +4451,7 @@ GlobalAccessFeedback::GlobalAccessFeedback(PropertyCellRef cell,
44514451

44524452
GlobalAccessFeedback::GlobalAccessFeedback(FeedbackSlotKind slot_kind)
44534453
: ProcessedFeedback(kGlobalAccess, slot_kind),
4454+
cell_or_context_(base::nullopt),
44544455
index_and_immutable_(0 /* doesn't matter */) {
44554456
DCHECK(IsGlobalICKind(slot_kind));
44564457
}

deps/v8/src/interpreter/interpreter.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ Interpreter::NewSourcePositionCollectionJob(
264264
auto job = std::make_unique<InterpreterCompilationJob>(parse_info, literal,
265265
allocator, nullptr);
266266
job->compilation_info()->SetBytecodeArray(existing_bytecode);
267-
return job;
267+
return std::unique_ptr<UnoptimizedCompilationJob> { static_cast<UnoptimizedCompilationJob*>(job.release()) };
268268
}
269269

270270
void Interpreter::ForEachBytecode(

0 commit comments

Comments
 (0)