From d9ab189f55d3a1c920960574138e6d03ba815735 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Fri, 30 Mar 2018 12:47:02 +0200 Subject: [PATCH] deps: cherry-pick b767cde1e7 from upstream V8 Original commit message: [intl] unbreak build with ICU 57 Remove a call to `icu::toUCharPtr()` that wasn't present in other similar looking call sites either, just reinterpret_cast directly. Fixes https://github.com/nodejs/node/issues/19656. Cq-Include-Trybots: luci.v8.try:v8_linux_noi18n_rel_ng Change-Id: If281ce0a39356aa8bd20efb24c3e4b52b06841a3 Reviewed-on: https://chromium-review.googlesource.com/987953 Reviewed-by: Daniel Ehrenberg Commit-Queue: Ben Noordhuis Cr-Commit-Position: refs/heads/master@{#52311} PR-URL: https://github.com/nodejs/node/pull/19710 Fixes: https://github.com/nodejs/node/issues/19656 Refs: https://github.com/v8/v8/commit/b767cde1e7bb94b3fea13f2d7e10cd90e6813d6c Reviewed-By: Colin Ihrig Reviewed-By: Steven R Loomis Reviewed-By: James M Snell --- deps/v8/include/v8-version.h | 2 +- deps/v8/src/runtime/runtime-intl.cc | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/deps/v8/include/v8-version.h b/deps/v8/include/v8-version.h index bfa0ff2b32e8d0..9754480e86c8b7 100644 --- a/deps/v8/include/v8-version.h +++ b/deps/v8/include/v8-version.h @@ -11,7 +11,7 @@ #define V8_MAJOR_VERSION 6 #define V8_MINOR_VERSION 2 #define V8_BUILD_NUMBER 414 -#define V8_PATCH_LEVEL 63 +#define V8_PATCH_LEVEL 64 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) diff --git a/deps/v8/src/runtime/runtime-intl.cc b/deps/v8/src/runtime/runtime-intl.cc index 783450c8ef1857..688f913794281d 100644 --- a/deps/v8/src/runtime/runtime-intl.cc +++ b/deps/v8/src/runtime/runtime-intl.cc @@ -631,8 +631,7 @@ RUNTIME_FUNCTION(Runtime_PluralRulesSelect) { icu::UnicodeString result = plural_rules->select(rounded); return *isolate->factory() ->NewStringFromTwoByte(Vector( - reinterpret_cast( - icu::toUCharPtr(result.getBuffer())), + reinterpret_cast(result.getBuffer()), result.length())) .ToHandleChecked(); }