diff options
| author | Matheus Marchini <matheus@sthima.com> | 2018-06-21 08:39:49 -0700 |
|---|---|---|
| committer | Michaël Zasso <targos@protonmail.com> | 2018-07-26 08:34:22 +0200 |
| commit | eea5aeea475afc0c97f8ce0af1675cfcea027d39 (patch) | |
| tree | 9bf13c4212e62f6ef105eb77fdca386e65d4b1cc | |
| parent | d15db8257c4b97d3f058281efdd1668cad0267ea (diff) | |
| download | node-new-eea5aeea475afc0c97f8ce0af1675cfcea027d39.tar.gz | |
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@{#53861}
Refs: https://github.com/v8/v8/commit/70c43402ee04d482ff64e186e2faf43fe
PR-URL: https://github.com/nodejs/node/pull/21126
Refs: https://github.com/v8/v8/commit/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>
| -rw-r--r-- | common.gypi | 2 | ||||
| -rw-r--r-- | deps/v8/src/api.cc | 4 | ||||
| -rw-r--r-- | deps/v8/src/log.cc | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/common.gypi b/common.gypi index 2a1d72f655..f3e9ac4154 100644 --- a/common.gypi +++ b/common.gypi @@ -28,7 +28,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 index f51576ed2a..34b4773c2f 100644 --- 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 index f46f849b4d..fb3b4761a3 100644 --- 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_) { \ |