Skip to content

Commit 3049d78

Browse files
bnoordhuisMylesBorins
authored andcommitted
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 #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: #19710 Fixes: #19656 Refs: v8/v8@b767cde Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Steven R Loomis <srloomis@us.ibm.com> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 0494552 commit 3049d78

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

deps/v8/include/v8-version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#define V8_MAJOR_VERSION 6
1212
#define V8_MINOR_VERSION 2
1313
#define V8_BUILD_NUMBER 414
14-
#define V8_PATCH_LEVEL 63
14+
#define V8_PATCH_LEVEL 64
1515

1616
// Use 1 for candidates and 0 otherwise.
1717
// (Boolean macro values are not supported by all preprocessors.)

deps/v8/src/runtime/runtime-intl.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -631,8 +631,7 @@ RUNTIME_FUNCTION(Runtime_PluralRulesSelect) {
631631
icu::UnicodeString result = plural_rules->select(rounded);
632632
return *isolate->factory()
633633
->NewStringFromTwoByte(Vector<const uint16_t>(
634-
reinterpret_cast<const uint16_t*>(
635-
icu::toUCharPtr(result.getBuffer())),
634+
reinterpret_cast<const uint16_t*>(result.getBuffer()),
636635
result.length()))
637636
.ToHandleChecked();
638637
}

0 commit comments

Comments
 (0)