diff options
author | Ben Noordhuis <info@bnoordhuis.nl> | 2018-03-30 12:47:02 +0200 |
---|---|---|
committer | James M Snell <jasnell@gmail.com> | 2018-04-14 12:59:26 -0700 |
commit | 45f6dccae1c98ef50d573786b25720ff0fcff5aa (patch) | |
tree | e5d47b27d44c93f929835528d671c0f82c80c398 /deps/v8/src/runtime | |
parent | 09c63460ebda30c7d5e7f40532a311fb2139803a (diff) | |
download | android-node-v8-45f6dccae1c98ef50d573786b25720ff0fcff5aa.tar.gz android-node-v8-45f6dccae1c98ef50d573786b25720ff0fcff5aa.tar.bz2 android-node-v8-45f6dccae1c98ef50d573786b25720ff0fcff5aa.zip |
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 <littledan@chromium.org>
Commit-Queue: Ben Noordhuis <info@bnoordhuis.nl>
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 <cjihrig@gmail.com>
Reviewed-By: Steven R Loomis <srloomis@us.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/19980
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
Reviewed-By: Yang Guo <yangguo@chromium.org>
Diffstat (limited to 'deps/v8/src/runtime')
-rw-r--r-- | deps/v8/src/runtime/runtime-intl.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/deps/v8/src/runtime/runtime-intl.cc b/deps/v8/src/runtime/runtime-intl.cc index a0e0db8cd0..385f386b6b 100644 --- a/deps/v8/src/runtime/runtime-intl.cc +++ b/deps/v8/src/runtime/runtime-intl.cc @@ -627,8 +627,7 @@ RUNTIME_FUNCTION(Runtime_PluralRulesSelect) { icu::UnicodeString result = plural_rules->select(rounded); return *isolate->factory() ->NewStringFromTwoByte(Vector<const uint16_t>( - reinterpret_cast<const uint16_t*>( - icu::toUCharPtr(result.getBuffer())), + reinterpret_cast<const uint16_t*>(result.getBuffer()), result.length())) .ToHandleChecked(); } |