deps: patch V8 to run on older XCode versions

ryzokuken · targos · commit be773fc3cfb3 · 2020-06-02T20:21:55.000+02: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. Backport-PR-URL: #33376 PR-URL: #32831 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
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.2',
+    'v8_embedder_string': '-node.3',
 
     ##### 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
@@ -4490,6 +4490,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
@@ -286,7 +286,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
`@@ -4490,6 +4490,7 @@ GlobalAccessFeedback::GlobalAccessFeedback(PropertyCellRef cell,`
`4490`	`4490`
`4491`	`4491`	`GlobalAccessFeedback::GlobalAccessFeedback(FeedbackSlotKind slot_kind)`
`4492`	`4492`	`: ProcessedFeedback(kGlobalAccess, slot_kind),`
	`4493`	`+ cell_or_context_(base::nullopt),`
`4493`	`4494`	`index_and_immutable_(0 /* doesn't matter */) {`
`4494`	`4495`	`DCHECK(IsGlobalICKind(slot_kind));`
`4495`	`4496`	`}`
Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ Interpreter::NewSourcePositionCollectionJob(`
`286`	`286`	`auto job = std::make_unique<InterpreterCompilationJob>(parse_info, literal,`
`287`	`287`	`allocator, nullptr);`
`288`	`288`	`job->compilation_info()->SetBytecodeArray(existing_bytecode);`
`289`		`- return job;`
	`289`	`+ return std::unique_ptr<UnoptimizedCompilationJob> { static_cast<UnoptimizedCompilationJob*>(job.release()) };`
`290`	`290`	`}`
`291`	`291`
`292`	`292`	`void Interpreter::ForEachBytecode(`