Use InternalArrays from certain Intl code

src/js/i18n.js

 // Copyright 2013 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.
 
 // ECMAScript 402 API implementation.
 
 /**
  * Intl object is a single object that has some named properties,
  * all of which are constructors.
  */
 (function(global, utils) {
 
 "use strict";
 
 %CheckIsBootstrapping();
 
 // -------------------------------------------------------------------
 // Imports
 
 var ArrayIndexOf;
 var ArrayJoin;
 var ArrayPush;
 var GlobalBoolean = global.Boolean;
 var GlobalDate = global.Date;
 var GlobalNumber = global.Number;
 var GlobalRegExp = global.RegExp;
 var GlobalString = global.String;
 var InstallFunctions = utils.InstallFunctions;
 var InstallGetter = utils.InstallGetter;
-var InternalPackedArray = utils.InternalPackedArray;
+var InternalArray = utils.InternalArray;
 var InternalRegExpMatch;
 var InternalRegExpReplace
 var IsFinite;
 var IsNaN;
 var MakeError;
 var MakeRangeError;
 var MakeTypeError;
 var ObjectHasOwnProperty = utils.ImportNow("ObjectHasOwnProperty");
 var OverrideFunction = utils.OverrideFunction;
 var patternSymbol = utils.ImportNow("intl_pattern_symbol");
@@ skipping 257 matching lines @@
       requestedLocales, AVAILABLE_LOCALES[service]));
 }
 
 
 /**
  * Returns the subset of the provided BCP 47 language priority list for which
  * this service has a matching locale when using the BCP 47 Lookup algorithm.
  * Locales appear in the same order in the returned list as in the input list.
  */
 function lookupSupportedLocalesOf(requestedLocales, availableLocales) {
-  var matchedLocales = [];
+  var matchedLocales = new InternalArray();
   for (var i = 0; i < requestedLocales.length; ++i) {
     // Remove -u- extension.
     var locale = InternalRegExpReplace(
         GetUnicodeExtensionRE(), requestedLocales[i], '');
     do {
       if (!IS_UNDEFINED(availableLocales[locale])) {
         // Push requested locale not the resolved one.
         %_Call(ArrayPush, matchedLocales, requestedLocales[i]);
         break;
       }
@@ skipping 239 matching lines @@
         }
       }
     }
   }
 
   return extension === ''? '' : '-u' + extension;
 }
 
 
 /**
- * Converts all OwnProperties into
+ * Given an array-like, outputs an Array with the numbered
+ * properties copied over and defined
  * configurable: false, writable: false, enumerable: true.
  */
-function freezeArray(array) {
-  var l = array.length;
+function freezeArray(input) {
+  var array = [];
+  var l = input.length;
   for (var i = 0; i < l; i++) {

[Yang, 2016/04/27 04:41:21]

Would %MoveArrayContents do the same?

[Dan Ehrenberg, 2016/04/27 04:51:34]

I'd still need to freeze each entry. Maybe Object.freeze afterwards would cover
it. Personally, I don't mind this phrasing because it parallels the spec text in
https://tc39.github.io/ecma402/#sec-supportedlocales .

-    if (i in array) {
-      %object_define_property(array, i, {value: array[i],
+    if (i in input) {
+      %object_define_property(array, i, {value: input[i],
                                          configurable: false,
                                          writable: false,
                                          enumerable: true});
     }
   }
 
   %object_define_property(array, 'length', {value: l, writable: false});
   return array;
 }
 
@@ skipping 156 matching lines @@
 
   return tag;
 }
 
 
 /**
  * Returns an array where all locales are canonicalized and duplicates removed.
  * Throws on locales that are not well formed BCP47 tags.
  */
 function initializeLocaleList(locales) {
-  var seen = [];
-  if (IS_UNDEFINED(locales)) {
-    // Constructor is called without arguments.
-    seen = [];
-  } else {
+  var seen = new InternalArray();
+  if (!IS_UNDEFINED(locales)) {
     // We allow single string localeID.
     if (typeof locales === 'string') {
       %_Call(ArrayPush, seen, canonicalizeLanguageTag(locales));
       return freezeArray(seen);
     }
 
     var o = TO_OBJECT(locales);
     var len = TO_UINT32(o.length);
 
     for (var k = 0; k < len; k++) {
@@ skipping 34 matching lines @@
   }
 
   // Check if there are any duplicate variants or singletons (extensions).
 
   // Remove private use section.
   locale = %_Call(StringSplit, locale, '-x-')[0];
 
   // Skip language since it can match variant regex, so we start from 1.
   // We are matching i-klingon here, but that's ok, since i-klingon-klingon
   // is not valid and would fail LANGUAGE_TAG_RE test.
-  var variants = [];
-  var extensions = [];
+  var variants = new InternalArray();
+  var extensions = new InternalArray();
   var parts = %_Call(StringSplit, locale, '-');
   for (var i = 1; i < parts.length; i++) {
     var value = parts[i];
     if (!IS_NULL(InternalRegExpMatch(GetLanguageVariantRE(), value)) &&
         extensions.length === 0) {
       if (%_Call(ArrayIndexOf, variants, value) === -1) {
         %_Call(ArrayPush, variants, value);
       } else {
         return false;
       }
@@ skipping 1307 matching lines @@
     }
 
     var locales = arguments[0];
     var options = arguments[1];
     return toLocaleDateTime(
         this, locales, options, 'time', 'time', 'dateformattime');
   }
 );
 
 })