Skip to content

Commit 5451975

Browse files
ryzokukentargos
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: #32116 Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>
1 parent c460f7a commit 5451975

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

Diff for: common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

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

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

Diff for: deps/v8/src/compiler/js-heap-broker.cc

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

44674467
GlobalAccessFeedback::GlobalAccessFeedback(FeedbackSlotKind slot_kind)
44684468
: ProcessedFeedback(kGlobalAccess, slot_kind),
4469+
cell_or_context_(base::nullopt),
44694470
index_and_immutable_(0 /* doesn't matter */) {
44704471
DCHECK(IsGlobalICKind(slot_kind));
44714472
}

Diff for: deps/v8/src/interpreter/interpreter.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ Interpreter::NewSourcePositionCollectionJob(
286286
auto job = std::make_unique<InterpreterCompilationJob>(parse_info, literal,
287287
allocator, nullptr);
288288
job->compilation_info()->SetBytecodeArray(existing_bytecode);
289-
return job;
289+
return std::unique_ptr<UnoptimizedCompilationJob> { static_cast<UnoptimizedCompilationJob*>(job.release()) };
290290
}
291291

292292
void Interpreter::ForEachBytecode(

0 commit comments

Comments
 (0)