Skip to content

Commit

Permalink
deps: cherry-pick b767cde1e7 from upstream V8
Browse files Browse the repository at this point in the history
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 <[email protected]>
    Commit-Queue: Ben Noordhuis <[email protected]>
    Cr-Commit-Position: refs/heads/master@{#52311}

PR-URL: #19710
Fixes: #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]>
  • Loading branch information
bnoordhuis authored and BridgeAR committed Apr 9, 2018
1 parent a892d9a commit a6db640
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,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.5',
'v8_embedder_string': '-node.6',

# Enable disassembler for `--print-code` v8 options
'v8_enable_disassembler': 1,
Expand Down
3 changes: 1 addition & 2 deletions deps/v8/src/runtime/runtime-intl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -626,8 +626,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();
}
Expand Down

0 comments on commit a6db640

Please sign in to comment.