Skip to content

Commit

Permalink
deps: V8: cherry-pick 90be99fab31c
Browse files Browse the repository at this point in the history
Original commit message:

    [intl] Revert date formatting behavior change from ICU 72

    Replace U+202F with U+0020 after formatting date. This lets websites
    continue to work without any changes.

    This matches Firefox behavior, according to
    https://bugzilla.mozilla.org/show_bug.cgi?id=1806042#c17.

    Bug: chromium:1414292, chromium:1401829, chromium:1392814
    Change-Id: I7c2b58414d0890f8705e737f903403dc54e5fe57
    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4237675
    Commit-Queue: Adam Klein <[email protected]>
    Reviewed-by: Shu-yu Guo <[email protected]>
    Cr-Commit-Position: refs/heads/main@{#85757}

Refs: v8/v8@90be99f
PR-URL: #46646
Refs: #46123
Reviewed-By: Jiawen Geng <[email protected]>
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Richard Lau <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Ruben Bridgewater <[email protected]>
  • Loading branch information
targos authored and BethGriggs committed Mar 27, 2023
1 parent b4ebe6d commit 85f88c6
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 1 deletion.
2 changes: 1 addition & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,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.25',
'v8_embedder_string': '-node.26',

##### 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 @@ -722,6 +722,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 @@ -437,6 +437,9 @@

# noi18n is required for Intl
'regress/regress-crbug-1052647': [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 @@ -659,6 +659,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

0 comments on commit 85f88c6

Please sign in to comment.