Fix resolvedOption calendar for "iso8601"

Use a bit to work around the issue of ICU getType() bug.

Bug: v8:11295
Change-Id: I15d65bd44c489031d789e7638ea8abab90128124
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2614216
Commit-Queue: Frank Tang <ftang@chromium.org>
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Reviewed-by: Shu-yu Guo <syg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#72028}

src/objects/js-date-time-format-inl.h

@@ -28,6 +28,8 @@ ACCESSORS(JSDateTimeFormat, icu_simple_date_format,
 ACCESSORS(JSDateTimeFormat, icu_date_interval_format,
           Managed<icu::DateIntervalFormat>, kIcuDateIntervalFormatOffset)
 
+BOOL_ACCESSORS(JSDateTimeFormat, flags, iso8601, Iso8601Bit::kShift)
+
 inline void JSDateTimeFormat::set_hour_cycle(HourCycle hour_cycle) {
   int hints = flags();
   hints = HourCycleBits::update(hints, hour_cycle);

src/objects/js-date-time-format.cc

@@ -510,7 +510,11 @@ MaybeHandle<JSObject> JSDateTimeFormat::ResolvedOptions(
   // and
   // http://www.unicode.org/repos/cldr/tags/latest/common/bcp47/calendar.xml
   if (calendar_str == "gregorian") {
+    if (date_time_format->iso8601()) {
+      calendar_str = "iso8601";
+    } else {
       calendar_str = "gregory";
+    }
   } else if (calendar_str == "ethiopic-amete-alem") {
     calendar_str = "ethioaa";
   }
@@ -1563,6 +1567,7 @@ MaybeHandle<JSDateTimeFormat> JSDateTimeFormat::New(
     icu_locale.setUnicodeKeywordValue("ca", calendar_str.get(), status);
     DCHECK(U_SUCCESS(status));
   }
+  bool iso8601 = strstr(icu_locale.getName(), "calendar=iso8601") != nullptr;
 
   if (numbering_system_str != nullptr &&
       Intl::IsValidNumberingSystem(numbering_system_str.get())) {
@@ -1870,6 +1875,7 @@ MaybeHandle<JSDateTimeFormat> JSDateTimeFormat::New(
     date_time_format->set_time_style(time_style);
   }
   date_time_format->set_hour_cycle(dateTimeFormatHourCycle);
+  date_time_format->set_iso8601(iso8601);
   date_time_format->set_locale(*locale_str);
   date_time_format->set_icu_locale(*managed_locale);
   date_time_format->set_icu_simple_date_format(*managed_format);

src/objects/js-date-time-format.h

@@ -128,6 +128,8 @@ class JSDateTimeFormat
   DECL_ACCESSORS(icu_simple_date_format, Managed<icu::SimpleDateFormat>)
   DECL_ACCESSORS(icu_date_interval_format, Managed<icu::DateIntervalFormat>)
 
+  DECL_BOOLEAN_ACCESSORS(iso8601)
+
   DECL_PRINTER(JSDateTimeFormat)
 
   TQ_OBJECT_CONSTRUCTORS(JSDateTimeFormat)

src/objects/js-date-time-format.tq

@@ -10,6 +10,7 @@ bitfield struct JSDateTimeFormatFlags extends uint31 {
   hour_cycle: HourCycle: 3 bit;
   date_style: DateTimeStyle: 3 bit;
   time_style: DateTimeStyle: 3 bit;
+  iso8601: bool: 1bit;
 }
 
 @generateCppClass

test/intl/regress-11295.js

+// Copyright 2021 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.
+
+let cal = (new Intl.DateTimeFormat('en-u-ca-iso8601'))
+        .resolvedOptions().calendar;
+assertEquals('iso8601', cal);
+cal = (new Intl.DateTimeFormat('en-u-ca-ISO8601'))
+        .resolvedOptions().calendar;
+assertEquals('iso8601', cal);
+cal = (new Intl.DateTimeFormat('en', {calendar: 'iso8601'}))
+        .resolvedOptions().calendar;
+assertEquals('iso8601', cal);
+cal = (new Intl.DateTimeFormat('en', {calendar: 'ISO8601'}))
+        .resolvedOptions().calendar;
+assertEquals('iso8601', cal);
+cal = (new Intl.DateTimeFormat('en-u-ca-ISO8601x'))
+        .resolvedOptions().calendar;
+assertEquals('gregory', cal);
+cal = (new Intl.DateTimeFormat('en', {calendar: 'iso8601x'}))
+        .resolvedOptions().calendar;
+assertEquals('gregory', cal);