deps: patch V8 to run on older XCode versions

ryzokuken · targos · commit 732847f1eb79 · 2021-02-11T19:09:38.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
@@ -4505,6 +4505,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
@@ -296,7 +296,7 @@ Interpreter::NewSourcePositionCollectionJob(
   auto job = std::make_unique<InterpreterCompilationJob>(parse_info, literal,
                                                          allocator, nullptr);
   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
`@@ -4505,6 +4505,7 @@ GlobalAccessFeedback::GlobalAccessFeedback(PropertyCellRef cell,`
`4505`	`4505`
`4506`	`4506`	`GlobalAccessFeedback::GlobalAccessFeedback(FeedbackSlotKind slot_kind)`
`4507`	`4507`	`: ProcessedFeedback(kGlobalAccess, slot_kind),`
	`4508`	`+ cell_or_context_(base::nullopt),`
`4508`	`4509`	`index_and_immutable_(0 /* doesn't matter */) {`
`4509`	`4510`	`DCHECK(IsGlobalICKind(slot_kind));`
`4510`	`4511`	`}`
Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,7 @@ Interpreter::NewSourcePositionCollectionJob(`
`296`	`296`	`auto job = std::make_unique<InterpreterCompilationJob>(parse_info, literal,`
`297`	`297`	`allocator, nullptr);`
`298`	`298`	`job->compilation_info()->SetBytecodeArray(existing_bytecode);`
`299`		`- return job;`
	`299`	`+ return std::unique_ptr<UnoptimizedCompilationJob> { static_cast<UnoptimizedCompilationJob*>(job.release()) };`
`300`	`300`	`}`
`301`	`301`
`302`	`302`	`void Interpreter::ForEachBytecode(`