Skip to content

Commit 6ae7d30

Browse files
ryzokukenMylesBorins
authored andcommitted
tools: 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: #30109 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 5bd6947 commit 6ae7d30

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

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

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

41164116
GlobalAccessFeedback::GlobalAccessFeedback(FeedbackSlotKind slot_kind)
41174117
: ProcessedFeedback(kGlobalAccess, slot_kind),
4118+
cell_or_context_(base::nullopt),
41184119
index_and_immutable_(0 /* doesn't matter */) {
41194120
DCHECK(IsGlobalICKind(slot_kind));
41204121
}

deps/v8/src/interpreter/interpreter.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ Interpreter::NewSourcePositionCollectionJob(
280280
auto job = base::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)