[Intl] Fix extra propertes in resolvedOptions

While dateStyle or timeStye is specified, we should not
add property listed in "Table Components of date and time formats"
per https://tc39.github.io/proposal-intl-datetime-style/#sec-initializedatetimeformat

Bug: v8:9107
Change-Id: I3e39112ed5f99b05f30b2f50f3cd3102d094f98e
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1559213Reviewed-by: Sathya Gunasekaran <gsathya@chromium.org>
Commit-Queue: Frank Tang <ftang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#60725}

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

@@ -495,16 +495,22 @@ MaybeHandle<JSObject> JSDateTimeFormat::ResolvedOptions(
     }
   }
 
-  for (const auto& item : GetPatternItems()) {
-    for (const auto& pair : item.pairs) {
-      if (pattern.find(pair.pattern) != std::string::npos) {
-        CHECK(JSReceiver::CreateDataProperty(
-                  isolate, options,
-                  factory->NewStringFromAsciiChecked(item.property.c_str()),
-                  factory->NewStringFromAsciiChecked(pair.value.c_str()),
-                  Just(kDontThrow))
-                  .FromJust());
-        break;
+  // If dateStyle and timeStyle are undefined, then internal slots
+  // listed in "Table 1: Components of date and time formats" will be set
+  // in Step 33.f.iii.1 of InitializeDateTimeFormat
+  if (date_time_format->date_style() == DateTimeStyle::kUndefined &&
+      date_time_format->time_style() == DateTimeStyle::kUndefined) {
+    for (const auto& item : GetPatternItems()) {
+      for (const auto& pair : item.pairs) {
+        if (pattern.find(pair.pattern) != std::string::npos) {
+          CHECK(JSReceiver::CreateDataProperty(
+                    isolate, options,
+                    factory->NewStringFromAsciiChecked(item.property.c_str()),
+                    factory->NewStringFromAsciiChecked(pair.value.c_str()),
+                    Just(kDontThrow))
+                    .FromJust());
+          break;
+        }
       }
     }
   }

test/intl/date-format/property-override-date-style.js

@@ -36,10 +36,6 @@ var expectedProperties = [
   'timeZone',
   'hourCycle',
   'hour12',
-  'weekday',
-  'year',
-  'month',
-  'day',
   'dateStyle',
 ];
 

test/intl/date-format/property-override-date-time-style.js

@@ -36,14 +36,6 @@ var expectedProperties = [
   'timeZone',
   'hourCycle',
   'hour12',
-  'weekday',
-  'year',
-  'month',
-  'day',
-  'hour',
-  'minute',
-  'second',
-  'timeZoneName',
   'dateStyle',
   'timeStyle',
 ];

test/intl/date-format/property-override-time-style.js

@@ -36,10 +36,6 @@ var expectedProperties = [
   'timeZone',
   'hourCycle',
   'hour12',
-  'hour',
-  'minute',
-  'second',
-  'timeZoneName',
   'timeStyle',
 ];
 

test/test262/testcfg.py

@@ -51,6 +51,7 @@ FEATURE_FLAGS = {
   'String.prototype.matchAll': '--harmony-string-matchall',
   'Symbol.matchAll': '--harmony-string-matchall',
   'numeric-separator-literal': '--harmony-numeric-separator',
+  'Intl.DateTimeFormat-datetimestyle': '--harmony-intl-datetime-style',
   'Intl.Locale': '--harmony-locale',
   'Intl.Segmenter': '--harmony-intl-segmenter',
   'Symbol.prototype.description': '--harmony-symbol-description',