deps: patch V8 to run on older XCode versions

ryzokuken · nodejs-ci · commit 97e60af39eb6 · 2019-10-21T10:19:52.000Z
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: nodejs/node#29694 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Gus Caplan <me@gus.host> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com>
diff --git a/common.gypi b/common.gypi
@@ -39,7 +39,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.9',
+    'v8_embedder_string': '-node.10',
 
     ##### 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
@@ -4202,6 +4202,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
@@ -297,7 +297,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
`@@ -4202,6 +4202,7 @@ GlobalAccessFeedback::GlobalAccessFeedback(PropertyCellRef cell,`
`4202`	`4202`
`4203`	`4203`	`GlobalAccessFeedback::GlobalAccessFeedback(FeedbackSlotKind slot_kind)`
`4204`	`4204`	`: ProcessedFeedback(kGlobalAccess, slot_kind),`
	`4205`	`+ cell_or_context_(base::nullopt),`
`4205`	`4206`	`index_and_immutable_(0 /* doesn't matter */) {`
`4206`	`4207`	`DCHECK(IsGlobalICKind(slot_kind));`
`4207`	`4208`	`}`
Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ Interpreter::NewSourcePositionCollectionJob(`
`297`	`297`	`auto job = std::make_unique<InterpreterCompilationJob>(parse_info, literal,`
`298`	`298`	`allocator, nullptr);`
`299`	`299`	`job->compilation_info()->SetBytecodeArray(existing_bytecode);`
`300`		`- return job;`
	`300`	`+ return std::unique_ptr<UnoptimizedCompilationJob> { static_cast<UnoptimizedCompilationJob*>(job.release()) };`
`301`	`301`	`}`
`302`	`302`
`303`	`303`	`void Interpreter::ForEachBytecode(`