[MERGE #5231 @jackhorton] Assorted Intl updates

Merge pull request #5231 from jackhorton:intl/assorted-fixes

Fixes OS#17896974

Author: jackhorton

lib/Runtime/Library/InJavascript/Intl.js

@@ -136,7 +136,11 @@
 
         keys: platform.builtInJavascriptObjectEntryKeys,
         hasOwnProperty(o, prop) { return callInstanceFunc(platform.builtInJavascriptObjectEntryHasOwnProperty, o, prop); },
-        defineProperty: platform.builtInJavascriptObjectEntryDefineProperty,
+        // If we don't set the descriptor's prototype to null, defining properties with `value`s can fail of Object.prototype.get is defined
+        defineProperty(o, prop, desc) {
+            _.setPrototypeOf(desc, null);
+            platform.builtInJavascriptObjectEntryDefineProperty(o, prop, desc);
+        },
         isExtensible: platform.builtInJavascriptObjectEntryIsExtensible,
         create(proto = null) { return platform.builtInJavascriptObjectCreate(proto); },
         setPrototypeOf(target, proto = null) { return platform.builtInSetPrototype(target, proto); },
@@ -846,19 +850,17 @@
             ? BestFitSupportedLocales(isAvailableLocale, requestedLocales)
             : LookupSupportedLocales(isAvailableLocale, requestedLocales);
 
-        // make sure property descriptor is null-prototyped to avoid tainting of Object.prototype.{get|set}
-        const descriptor = _.setPrototypeOf({ configurable: false, writable: false });
         for (let i = 0; i < supportedLocales.length; i++) {
-            _.defineProperty(supportedLocales, Internal.ToString(i), descriptor);
+            _.defineProperty(supportedLocales, Internal.ToString(i), { configurable: false, writable: false });
         }
 
         // test262 supportedLocalesOf-returned-array-elements-are-frozen.js:
         // Property length of object returned by SupportedLocales should not be writable
-        _.defineProperty(supportedLocales, "length", _.setPrototypeOf({
+        _.defineProperty(supportedLocales, "length", {
             writable: false,
             configurable: false,
             enumerable: false,
-        }));
+        });
 
         return supportedLocales;
     };
@@ -2015,7 +2017,7 @@
         };
 
         // params are explicitly `= undefined` to make PluralRules.length === 0
-        const PluralRules = function (locales = undefined, options = undefined) {
+        const PluralRules = function PluralRules(locales = undefined, options = undefined) {
             if (new.target === undefined) {
                 platform.raiseNeedObjectOfType("Intl.PluralRules", "PluralRules");
             }
@@ -2058,7 +2060,7 @@
         });
 
         // ECMA 402: #sec-intl.pluralrules.prototype.select
-        const select = function (value) {
+        const select = function select(value) {
             const pr = platform.getHiddenObject(this);
             if (!pr || !pr.initializedPluralRules) {
                 platform.raiseNeedObjectOfType("Intl.PluralRules.prototype.select", "PluralRules");
@@ -2075,31 +2077,29 @@
             writable: true,
         });
 
-        const resolvedOptions = function () {
+        const resolvedOptions = function resolvedOptions() {
             const pr = platform.getHiddenObject(this);
             if (!pr || !pr.initializedPluralRules) {
                 platform.raiseNeedObjectOfType("Intl.PluralRules.prototype.select", "PluralRules");
             }
 
-            const options = {};
-            _.forEach([
+            return createResolvedOptions([
                 "locale",
                 "type",
                 "minimumIntegerDigits",
                 "minimumFractionDigits",
                 "maximumFractionDigits",
                 "minimumSignificantDigits",
-                "maximumSignificantDigits"
-            ], (prop) => {
-                if (pr[prop] !== undefined) {
-                    options[prop] = pr[prop];
+                "maximumSignificantDigits",
+                "pluralCategories"
+            ], pr, (prop, resolved) => {
+                if (prop === "pluralCategories") {
+                    // https://github.com/tc39/ecma402/issues/224: create a copy of the pluralCategories array
+                    resolved.pluralCategories = _.slice(pr.pluralCategories, 0);
+                } else {
+                    resolved[prop] = pr[prop];
                 }
             });
-
-            // https://github.com/tc39/ecma402/issues/224: create a copy of the pluralCategories array
-            options.pluralCategories = _.slice(pr.pluralCategories, 0);
-
-            return options;
         };
         tagPublicFunction("Intl.PluralRules.prototype.resolvedOptions", resolvedOptions);
         _.defineProperty(PluralRules.prototype, "resolvedOptions", {
@@ -2114,10 +2114,10 @@
 
     // Initialize Intl properties only if needed
     if (InitType === "Intl") {
-        ObjectDefineProperty(Intl, "Collator",              { value: Collator,              writable: true, enumerable: false, configurable: true });
-        ObjectDefineProperty(Intl, "NumberFormat",          { value: NumberFormat,          writable: true, enumerable: false, configurable: true });
-        ObjectDefineProperty(Intl, "DateTimeFormat",        { value: DateTimeFormat,        writable: true, enumerable: false, configurable: true });
-        ObjectDefineProperty(Intl, "PluralRules",           { value: PluralRules,           writable: true, enumerable: false, configurable: true });
+        _.defineProperty(Intl, "Collator",              { value: Collator,              writable: true, enumerable: false, configurable: true });
+        _.defineProperty(Intl, "NumberFormat",          { value: NumberFormat,          writable: true, enumerable: false, configurable: true });
+        _.defineProperty(Intl, "DateTimeFormat",        { value: DateTimeFormat,        writable: true, enumerable: false, configurable: true });
+        _.defineProperty(Intl, "PluralRules",           { value: PluralRules,           writable: true, enumerable: false, configurable: true });
     }
 
     }