Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: V8: cherry-pick 90be99fab31c #46646

Merged
merged 2 commits into from
Feb 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,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.9',
'v8_embedder_string': '-node.10',

##### V8 defaults for Node.js #####

Expand Down
5 changes: 5 additions & 0 deletions deps/v8/src/objects/js-date-time-format.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1395,6 +1395,11 @@ MaybeHandle<String> FormatDateTime(Isolate* isolate,
icu::UnicodeString result;
date_format.format(date_value, result);

// Revert ICU 72 change that introduced U+202F instead of U+0020
// to separate time from AM/PM. See https://crbug.com/1414292.
result = result.findAndReplace(icu::UnicodeString(0x202f),
icu::UnicodeString(0x20));

return Intl::ToString(isolate, result);
}

Expand Down
3 changes: 3 additions & 0 deletions deps/v8/test/mjsunit/mjsunit.status
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,9 @@

# Non-BMP characters currently aren't considered identifiers in no_i18n
'harmony/private-name-surrogate-pair': [PASS,FAIL],

# Tests ICU-specific behavior.
'regress/regress-crbug-1414292': [SKIP],
}], # 'no_i18n'

##############################################################################
Expand Down
17 changes: 17 additions & 0 deletions deps/v8/test/mjsunit/regress/regress-crbug-1414292.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Copyright 2023 the V8 project authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

const date = new Date("Wed Feb 15 2023 00:00:00 GMT+0100");
const localeString = date.toLocaleString("en-US");
// No narrow-width space should be found
assertEquals(-1, localeString.search('\u202f'));
// Regular space should match the character between time and AM/PM.
assertMatches(/:\d\d:\d\d [AP]M$/, localeString);

const formatter = new Intl.DateTimeFormat('en', {timeStyle: "long"})
const formattedString = formatter.format(date)
// No narrow-width space should be found
assertEquals(-1, formattedString.search('\u202f'));
// Regular space should match the character between time and AM/PM.
assertMatches(/:\d\d:\d\d [AP]M$/, localeString);
4 changes: 4 additions & 0 deletions deps/v8/test/test262/test262.status
Original file line number Diff line number Diff line change
Expand Up @@ -1007,6 +1007,10 @@
'language/expressions/assignmenttargettype/direct-callexpression-arguments': [FAIL],
'language/expressions/assignmenttargettype/parenthesized-callexpression-arguments': [FAIL],

# We replace U+202F (narrow-width space) with U+0020 (regular space).
# https://crbug.com/1414292
'intl402/DateTimeFormat/prototype/format/timedatestyle-en': [FAIL],

############################ INVALID TESTS #############################

# Test makes unjustified assumptions about the number of calls to SortCompare.
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-icu-env.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ if (isMockable) {
assert.deepStrictEqual(
locales.map((LANG) => runEnvOutside({ LANG, TZ: 'Europe/Zurich' }, 'new Date(333333333333).toLocaleString()')),
[
'7/25/1980, 1:35:33AM',
'7/25/1980, 1:35:33 AM',
'1980/7/25 01:35:33',
'25/7/1980, 1:35:33 am',
'25/7/1980, 1:35:33',
Expand Down
6 changes: 1 addition & 5 deletions test/parallel/test-intl.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,7 @@ if (!common.hasIntl) {
// Test format
{
const localeString = date0.toLocaleString(['en'], optsGMT);
if (Number(process.versions.cldr) >= 42) {
assert.strictEqual(localeString, '1/1/1970, 12:00:00 AM');
} else {
assert.strictEqual(localeString, '1/1/1970, 12:00:00 AM');
}
assert.strictEqual(localeString, '1/1/1970, 12:00:00 AM');
}
// number format
{
Expand Down