AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[Intl] Remove quarter hack after cherrypick icu fix.

Browse Source 
Manually roll ICU to 7ca3ffa to pick up an upstream fix for quarter handling.

Remove the hack that prevent unexpected behavior in ICU
and remove the skip of failing tests.

Bug: v8:8151,v8:7869
Cq-Include-Trybots: luci.v8.try:v8_linux_noi18n_rel_ng
Change-Id: Ic9a56679bf1eb9dc18c739161838d518fd664d6f
Reviewed-on: https://chromium-review.googlesource.com/1214522
Reviewed-by: Jungshik Shin <jshin@chromium.org>
Reviewed-by: Sathya Gunasekaran <gsathya@chromium.org>
Commit-Queue: Frank Tang <ftang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#55774}
This commit is contained in:
Frank Tang 2018-09-10 15:47:19 -07:00 committed by Commit Bot
parent 5609e27ec6
commit eec50fa3cf
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/objects/js-relative-time-format.cc
View File

@ -20,6 +20,7 @@
#include "src/objects/managed.h"
#include "unicode/numfmt.h"
#include "unicode/reldatefmt.h"
#include "unicode/uvernum.h" // for U_ICU_VERSION_MAJOR_NUM
namespace v8 {
namespace internal {
@ -351,16 +352,20 @@ MaybeHandle<Object> JSRelativeTimeFormat::Format(
UErrorCode status = U_ZERO_ERROR;
icu::UnicodeString formatted;
if (unit_enum == UDAT_REL_UNIT_QUARTER) {
// ICU have not yet implement UDAT_REL_UNIT_QUARTER.
} else {
#if USE_CHROMIUM_ICU != 1 && U_ICU_VERSION_MAJOR_NUM < 63
if (unit_enum != UDAT_REL_UNIT_QUARTER) { // ICU did not implement
// UDAT_REL_UNIT_QUARTER < 63
#endif // USE_CHROMIUM_ICU != 1 && U_ICU_VERSION_MAJOR_NUM < 63
if (format_holder->numeric() == JSRelativeTimeFormat::Numeric::ALWAYS) {
formatter->formatNumeric(number, unit_enum, formatted, status);
} else {
DCHECK_EQ(JSRelativeTimeFormat::Numeric::AUTO, format_holder->numeric());
formatter->format(number, unit_enum, formatted, status);
}
#if USE_CHROMIUM_ICU != 1 && U_ICU_VERSION_MAJOR_NUM < 63
}
#endif // USE_CHROMIUM_ICU != 1 && U_ICU_VERSION_MAJOR_NUM < 63
if (U_FAILURE(status)) {
THROW_NEW_ERROR(isolate, NewTypeError(MessageTemplate::kIcuError), Object);

14
test/test262/test262.status
View File

@ -614,19 +614,7 @@
# https://bugs.chromium.org/p/v8/issues/detail?id=8099
'intl402/NumberFormat/prototype/format/format-negative-numbers': [FAIL],
# https://bugs.chromium.org/p/v8/issues/detail?id=7869
'intl402/RelativeTimeFormat/prototype/format/en-us-numeric-always': [FAIL],
'intl402/RelativeTimeFormat/prototype/format/en-us-numeric-auto': [FAIL],
'intl402/RelativeTimeFormat/prototype/format/en-us-style-short': [FAIL],
'intl402/RelativeTimeFormat/prototype/format/pl-pl-style-long': [FAIL],
'intl402/RelativeTimeFormat/prototype/format/pl-pl-style-narrow': [FAIL],
'intl402/RelativeTimeFormat/prototype/format/pl-pl-style-short': [FAIL],
'intl402/RelativeTimeFormat/prototype/formatToParts/en-us-numeric-always': [FAIL],
'intl402/RelativeTimeFormat/prototype/formatToParts/en-us-numeric-auto': [FAIL],
'intl402/RelativeTimeFormat/prototype/formatToParts/en-us-style-short': [FAIL],
'intl402/RelativeTimeFormat/prototype/formatToParts/pl-pl-style-long': [FAIL],
'intl402/RelativeTimeFormat/prototype/formatToParts/pl-pl-style-narrow': [FAIL],
'intl402/RelativeTimeFormat/prototype/formatToParts/pl-pl-style-short': [FAIL],
# https://bugs.chromium.org/p/v8/issues/detail?id=8151
'intl402/RelativeTimeFormat/prototype/formatToParts/unit-plural': [FAIL],
# https://bugs.chromium.org/p/v8/issues/detail?id=7871