Skip to content

Commit a6db640

Browse files
bnoordhuisBridgeAR
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 nodejs#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 <[email protected]> Commit-Queue: Ben Noordhuis <[email protected]> Cr-Commit-Position: refs/heads/master@{nodejs#52311} PR-URL: nodejs#19710 Fixes: nodejs#19656 Refs: v8/v8@b767cde Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Steven R Loomis <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent a892d9a commit a6db640

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

common.gypi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
# Reset this number to 0 on major V8 upgrades.
2929
# Increment by one for each non-official patch applied to deps/v8.
30-
'v8_embedder_string': '-node.5',
30+
'v8_embedder_string': '-node.6',
3131

3232
# Enable disassembler for `--print-code` v8 options
3333
'v8_enable_disassembler': 1,

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -626,8 +626,7 @@ RUNTIME_FUNCTION(Runtime_PluralRulesSelect) {
626626
icu::UnicodeString result = plural_rules->select(rounded);
627627
return *isolate->factory()
628628
->NewStringFromTwoByte(Vector<const uint16_t>(
629-
reinterpret_cast<const uint16_t*>(
630-
icu::toUCharPtr(result.getBuffer())),
629+
reinterpret_cast<const uint16_t*>(result.getBuffer()),
631630
result.length()))
632631
.ToHandleChecked();
633632
}

0 commit comments

Comments
 (0)