deps: patch V8 to run on older XCode versions

ryzokuken · targos · commit f26c461772d4 · 2021-03-03T17:31:07.000+01:00
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 <targos@protonmail.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
diff --git 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
@@ -4626,6 +4626,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
@@ -314,7 +314,7 @@ Interpreter::NewSourcePositionCollectionJob(
   auto job = std::make_unique<InterpreterCompilationJob>(
       parse_info, literal, allocator, nullptr, local_isolate);
   job->compilation_info()->SetBytecodeArray(existing_bytecode);
-  return job;
+  return std::unique_ptr<UnoptimizedCompilationJob> { static_cast<UnoptimizedCompilationJob*>(job.release()) };
 }
 
 void Interpreter::ForEachBytecode(

Original file line number	Diff line number	Diff line change
`@@ -4626,6 +4626,7 @@ GlobalAccessFeedback::GlobalAccessFeedback(PropertyCellRef cell,`
`4626`	`4626`
`4627`	`4627`	`GlobalAccessFeedback::GlobalAccessFeedback(FeedbackSlotKind slot_kind)`
`4628`	`4628`	`: ProcessedFeedback(kGlobalAccess, slot_kind),`
	`4629`	`+ cell_or_context_(base::nullopt),`
`4629`	`4630`	`index_and_immutable_(0 /* doesn't matter */) {`
`4630`	`4631`	`DCHECK(IsGlobalICKind(slot_kind));`
`4631`	`4632`	`}`
Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,7 @@ Interpreter::NewSourcePositionCollectionJob(`
`314`	`314`	`auto job = std::make_unique<InterpreterCompilationJob>(`
`315`	`315`	`parse_info, literal, allocator, nullptr, local_isolate);`
`316`	`316`	`job->compilation_info()->SetBytecodeArray(existing_bytecode);`
`317`		`- return job;`
	`317`	`+ return std::unique_ptr<UnoptimizedCompilationJob> { static_cast<UnoptimizedCompilationJob*>(job.release()) };`
`318`	`318`	`}`
`319`	`319`
`320`	`320`	`void Interpreter::ForEachBytecode(`