From 64d5be25ab282cf3f825e7068a94bbba8cddce95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Fri, 12 Mar 2021 08:28:36 +0100 Subject: [PATCH] deps: V8: cherry-pick 1648e050cade Original commit message: torque: workaround stod() limitations on Solaris std::stod() on Solaris does not currently handle hex strings. This commit provides a workaround based on strtol() until proper stod() support is available. This was encountered while updating Node.js to V8 8.8. For more details see the following comment: https://github.com/nodejs/node/pull/36139#issuecomment-740131942 Change-Id: I16ed80a817f6d9105e7153b10824b1fee8520432 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2692746 Reviewed-by: Michael Stanton Commit-Queue: Michael Stanton Cr-Commit-Position: refs/heads/master@{#73255} Refs: https://github.com/v8/v8/commit/1648e050cade0e0803714a488ab0c8817d9eaf5c PR-URL: https://github.com/nodejs/node/pull/37587 Reviewed-By: Jiawen Geng Reviewed-By: Colin Ihrig Reviewed-By: Myles Borins --- common.gypi | 2 +- deps/v8/src/torque/torque-parser.cc | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/common.gypi b/common.gypi index 2bcceacbb5b227..79a22ac0faca37 100644 --- a/common.gypi +++ b/common.gypi @@ -36,7 +36,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.6', + 'v8_embedder_string': '-node.7', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/src/torque/torque-parser.cc b/deps/v8/src/torque/torque-parser.cc index 428ee9e80490fb..9a81d402ead5a0 100644 --- a/deps/v8/src/torque/torque-parser.cc +++ b/deps/v8/src/torque/torque-parser.cc @@ -1834,7 +1834,18 @@ base::Optional MakeNumberLiteralExpression( // Meanwhile, we type it as constexpr float64 when out of int32 range. double value = 0; try { +#if defined(V8_OS_SOLARIS) + // stod() on Solaris does not currently support hex strings. Use strtol() + // specifically for hex literals until stod() support is available. + if (number.find("0x") == std::string::npos && + number.find("0X") == std::string::npos) { + value = std::stod(number); + } else { + value = static_cast(strtol(number.c_str(), nullptr, 0)); + } +#else value = std::stod(number); +#endif // !defined(V8_OS_SOLARIS) } catch (const std::out_of_range&) { Error("double literal out-of-range").Throw(); }