Skip to content

Commit 62ca2cf

Browse files
Matheus Marchinitargos
Matheus Marchini
authored andcommittedJun 24, 2018
deps: cherry-pick 70c4340 from upstream V8
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. [email protected], [email protected], [email protected] 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 <[email protected]> Commit-Queue: Yang Guo <[email protected]> Cr-Commit-Position: refs/heads/master@{#53861} Refs: v8/v8@70c4340 PR-URL: #21126 Refs: v8/v8@aa6ce3e Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent ab27e0e commit 62ca2cf

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed
 

‎common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
# Reset this number to 0 on major V8 upgrades.
2929
# Increment by one for each non-official patch applied to deps/v8.
30-
'v8_embedder_string': '-node.12',
30+
'v8_embedder_string': '-node.13',
3131

3232
# Enable disassembler for `--print-code` v8 options
3333
'v8_enable_disassembler': 1,

‎deps/v8/src/api.cc

+4
Original file line numberDiff line numberDiff line change
@@ -10255,6 +10255,10 @@ const char* CodeEvent::GetCodeEventTypeName(CodeEventType code_event_type) {
1025510255
CODE_EVENTS_LIST(V)
1025610256
#undef V
1025710257
}
10258+
// The execution should never pass here
10259+
UNREACHABLE();
10260+
// NOTE(mmarchini): Workaround to fix a compiler failure on GCC 4.9
10261+
return "Unknown";
1025810262
}
1025910263

1026010264
CodeEventHandler::CodeEventHandler(Isolate* isolate) {

‎deps/v8/src/log.cc

+4
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ static v8::CodeEventType GetCodeEventTypeForTag(
5959
TAGS_LIST(V)
6060
#undef V
6161
}
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;
6266
}
6367
#define CALL_CODE_EVENT_HANDLER(Call) \
6468
if (listener_) { \

0 commit comments

Comments
 (0)
Please sign in to comment.