summaryrefslogtreecommitdiff
path: root/deps/v8/src/objects/js-locale.cc
diff options
context:
space:
mode:
authorRefael Ackermann <refack@gmail.com>2019-05-28 08:46:21 -0400
committerRefael Ackermann <refack@gmail.com>2019-06-01 09:55:12 -0400
commited74896b1fae1c163b3906163f3bf46326618ddb (patch)
tree7fb05c5a19808e0c5cd95837528e9005999cf540 /deps/v8/src/objects/js-locale.cc
parent2a850cd0664a4eee51f44d0bb8c2f7a3fe444154 (diff)
downloadnode-new-ed74896b1fae1c163b3906163f3bf46326618ddb.tar.gz
deps: update V8 to 7.5.288.22
PR-URL: https://github.com/nodejs/node/pull/27375 Reviewed-By: Michaƫl Zasso <targos@protonmail.com> Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com> Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
Diffstat (limited to 'deps/v8/src/objects/js-locale.cc')
-rw-r--r--deps/v8/src/objects/js-locale.cc13
1 files changed, 5 insertions, 8 deletions
diff --git a/deps/v8/src/objects/js-locale.cc b/deps/v8/src/objects/js-locale.cc
index 94b4cb2aba..4e35c16b0f 100644
--- a/deps/v8/src/objects/js-locale.cc
+++ b/deps/v8/src/objects/js-locale.cc
@@ -98,15 +98,12 @@ Maybe<bool> InsertOptionsIntoLocale(Isolate* isolate,
}
DCHECK_NOT_NULL(value_str.get());
- // Convert bcp47 key and value into legacy ICU format so we can use
- // uloc_setKeywordValue.
- const char* key = uloc_toLegacyKey(option_to_bcp47.key);
- DCHECK_NOT_NULL(key);
-
// Overwrite existing, or insert new key-value to the locale string.
- const char* value = uloc_toLegacyType(key, value_str.get());
- if (value) {
- icu_locale->setKeywordValue(key, value, status);
+ if (uloc_toLegacyType(uloc_toLegacyKey(option_to_bcp47.key),
+ value_str.get())) {
+ // Only call setUnicodeKeywordValue if that value is a valid one.
+ icu_locale->setUnicodeKeywordValue(option_to_bcp47.key, value_str.get(),
+ status);
if (U_FAILURE(status)) {
return Just(false);
}