From 017fa6d55ff27fa108d622b1f00e5b07ac479e15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bargull?= <andre.bargull@gmail.com>
Date: Thu, 21 Dec 2017 12:08:11 -0800
Subject: [PATCH] Remove caching of getLocaleSupportInfo() return value

---
 harness/testIntl.js       | 30 +-----------------------------
 test/intl402/9.2.6_4_b.js |  3 ++-
 2 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/harness/testIntl.js b/harness/testIntl.js
index 8b9d296888..eb63b23ac0 100644
--- a/harness/testIntl.js
+++ b/harness/testIntl.js
@@ -33,26 +33,6 @@ function testWithIntlConstructors(f) {
 }
 
 
-/**
- * Returns the name of the given constructor object, which must be one of
- * Intl.Collator, Intl.NumberFormat, or Intl.DateTimeFormat.
- * @param {object} Constructor a constructor
- * @return {string} the name of the constructor
- */
-function getConstructorName(Constructor) {
-  switch (Constructor) {
-    case Intl.Collator:
-      return "Collator";
-    case Intl.NumberFormat:
-      return "NumberFormat";
-    case Intl.DateTimeFormat:
-      return "DateTimeFormat";
-    default:
-      $ERROR("test internal error: unknown Constructor");
-  }
-}
-
-
 /**
  * Taints a named data property of the given object by installing
  * a setter that throws an exception.
@@ -121,7 +101,6 @@ function taintArray() {
 var languages = ["zh", "es", "en", "hi", "ur", "ar", "ja", "pa"];
 var scripts = ["Latn", "Hans", "Deva", "Arab", "Jpan", "Hant"];
 var countries = ["CN", "IN", "US", "PK", "JP", "TW", "HK", "SG"];
-var localeSupportInfo = {};
 
 
 /**
@@ -134,11 +113,6 @@ var localeSupportInfo = {};
  *   unsupported: array of unsupported language tags
  */
 function getLocaleSupportInfo(Constructor) {
-  var constructorName = getConstructorName(Constructor);
-  if (localeSupportInfo[constructorName] !== undefined) {
-    return localeSupportInfo[constructorName];
-  }
-
   var allTags = [];
   var i, j, k;
   var language, script, country;
@@ -174,13 +148,11 @@ function getLocaleSupportInfo(Constructor) {
     }
   }
 
-  localeSupportInfo[constructorName] = {
+  return {
     supported: supported,
     byFallback: byFallback,
     unsupported: unsupported
   };
-
-  return localeSupportInfo[constructorName];
 }
 
 
diff --git a/test/intl402/9.2.6_4_b.js b/test/intl402/9.2.6_4_b.js
index d94bf4d1fc..9d1efb460f 100644
--- a/test/intl402/9.2.6_4_b.js
+++ b/test/intl402/9.2.6_4_b.js
@@ -11,9 +11,10 @@ includes: [testIntl.js]
 ---*/
 
 testWithIntlConstructors(function (Constructor) {
+    var info = getLocaleSupportInfo(Constructor);
+
     // this test should work equally for both matching algorithms
     ["lookup", "best fit"].forEach(function (matcher) {
-        var info = getLocaleSupportInfo(Constructor);
         var allLocales = info.supported.concat(info.byFallback, info.unsupported);
         allLocales.forEach(function (locale) {
             var validExtension = "-u-co-phonebk-nu-latn";