Skip to content

Commit eea5aee

Browse files
Matheus Marchinitargos
Matheus Marchini
authored andcommitted
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. 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@{nodejs#53861} Refs: v8/v8@70c4340 PR-URL: nodejs#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>
1 parent d15db82 commit eea5aee

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
@@ -28,7 +28,7 @@
2828

2929
# Reset this number to 0 on major V8 upgrades.
3030
# Increment by one for each non-official patch applied to deps/v8.
31-
'v8_embedder_string': '-node.5',
31+
'v8_embedder_string': '-node.6',
3232

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

deps/v8/src/api.cc

+4
Original file line numberDiff line numberDiff line change
@@ -10148,6 +10148,10 @@ const char* CodeEvent::GetCodeEventTypeName(CodeEventType code_event_type) {
1014810148
CODE_EVENTS_LIST(V)
1014910149
#undef V
1015010150
}
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";
1015110155
}
1015210156

1015310157
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)