deps: cherry-pick 70c4340 from upstream V8

Matheus Marchini · MylesBorins · commit 3afffebb5b81 · 2018-08-09T21:57:46.000-04:00
Original commit message: [log][api] Fix GCC 4.9 build failure GCC 4.9 used on some Node.js CI machines complains when the control reaches the end of a non-void function and no return is encountered. R=bmeurer@google.com, ofrobots@google.com, yangguo@google.com Cq-Include-Trybots: luci.chromium.try:linux_chromium_rel_ng Change-Id: I5af0192cb187eccbf34dbb60ff3ac2e4774af803 Reviewed-on: https://chromium-review.googlesource.com/1105619 Reviewed-by: Yang Guo <yangguo@chromium.org> Commit-Queue: Yang Guo <yangguo@chromium.org> Cr-Commit-Position: refs/heads/master@{#53861} Refs: v8/v8@70c4340 Backport-PR-URL: #21668 PR-URL: #21126 Refs: v8/v8@aa6ce3e Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/common.gypi b/common.gypi
@@ -29,7 +29,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.5',
+    'v8_embedder_string': '-node.6',
 
     # Enable disassembler for `--print-code` v8 options
     'v8_enable_disassembler': 1,
diff --git a/deps/v8/src/api.cc b/deps/v8/src/api.cc
@@ -10148,6 +10148,10 @@ const char* CodeEvent::GetCodeEventTypeName(CodeEventType code_event_type) {
       CODE_EVENTS_LIST(V)
 #undef V
   }
+  // The execution should never pass here
+  UNREACHABLE();
+  // NOTE(mmarchini): Workaround to fix a compiler failure on GCC 4.9
+  return "Unknown";
 }
 
 CodeEventHandler::CodeEventHandler(Isolate* isolate) {
diff --git a/deps/v8/src/log.cc b/deps/v8/src/log.cc
@@ -59,6 +59,10 @@ static v8::CodeEventType GetCodeEventTypeForTag(
       TAGS_LIST(V)
 #undef V
   }
+  // The execution should never pass here
+  UNREACHABLE();
+  // NOTE(mmarchini): Workaround to fix a compiler failure on GCC 4.9
+  return v8::CodeEventType::kUnknownType;
 }
 #define CALL_CODE_EVENT_HANDLER(Call) \
   if (listener_) {                    \

Original file line number	Diff line number	Diff line change
`@@ -10148,6 +10148,10 @@ const char* CodeEvent::GetCodeEventTypeName(CodeEventType code_event_type) {`
`10148`	`10148`	`CODE_EVENTS_LIST(V)`
`10149`	`10149`	`#undef V`
`10150`	`10150`	`}`
	`10151`	`+ // The execution should never pass here`
	`10152`	`+ UNREACHABLE();`
	`10153`	`+ // NOTE(mmarchini): Workaround to fix a compiler failure on GCC 4.9`
	`10154`	`+ return "Unknown";`
`10151`	`10155`	`}`
`10152`	`10156`
`10153`	`10157`	`CodeEventHandler::CodeEventHandler(Isolate* isolate) {`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,10 @@ static v8::CodeEventType GetCodeEventTypeForTag(`
`59`	`59`	`TAGS_LIST(V)`
`60`	`60`	`#undef V`
`61`	`61`	`}`
	`62`	`+ // The execution should never pass here`
	`63`	`+ UNREACHABLE();`
	`64`	`+ // NOTE(mmarchini): Workaround to fix a compiler failure on GCC 4.9`
	`65`	`+ return v8::CodeEventType::kUnknownType;`
`62`	`66`	`}`
`63`	`67`	`#define CALL_CODE_EVENT_HANDLER(Call) \`
`64`	`68`	`if (listener_) { \`