Merge branch 'master' into remove-unboxed

# Conflicts:
#	js/src/jit/BaselineIC.cpp
#	js/src/jsarray.cpp

1 files changed, 85 insertions, 11 deletions

diff --git a/intl/icu/source/data/misc/metaZones.txt b/intl/icu/source/data/misc/metaZones.txt
index e63ae3cef..84a9c598b 100644
--- a/intl/icu/source/data/misc/metaZones.txt
+++ b/intl/icu/source/data/misc/metaZones.txt
@@ -1,4 +1,4 @@
-// © 2016 and later: Unicode, Inc. and others.
+// © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 metaZones:table(nofallback){
     mapTimezones{
@@ -131,11 +131,11 @@ metaZones:table(nofallback){
             001{"America/Halifax"}
             AG{"America/Antigua"}
             AI{"America/Anguilla"}
-            AN{"America/Curacao"}
             AW{"America/Aruba"}
             BB{"America/Barbados"}
             BM{"Atlantic/Bermuda"}
             BQ{"America/Kralendijk"}
+            CW{"America/Curacao"}
             DM{"America/Dominica"}
             GD{"America/Grenada"}
             GL{"America/Thule"}
@@ -212,7 +212,6 @@ metaZones:table(nofallback){
         }
         Chile{
             001{"America/Santiago"}
-            AQ{"Antarctica/Palmer"}
         }
         China{
             001{"Asia/Shanghai"}
@@ -345,7 +344,6 @@ metaZones:table(nofallback){
             SH{"Atlantic/St_Helena"}
             SL{"Africa/Freetown"}
             SN{"Africa/Dakar"}
-            ST{"Africa/Sao_Tome"}
             TG{"Africa/Lome"}
         }
         Galapagos{
@@ -815,7 +813,7 @@ metaZones:table(nofallback){
             {
                 "Europe_Western",
                 "1985-12-31 23:00",
-                "9999-12-31 23:59",
+                "2018-10-28 02:00",
             }
         }
         "Africa:Ceuta"{
@@ -864,7 +862,7 @@ metaZones:table(nofallback){
             {
                 "Europe_Western",
                 "1976-04-14 01:00",
-                "9999-12-31 23:59",
+                "2018-10-28 02:00",
             }
         }
         "Africa:Freetown"{
@@ -913,6 +911,11 @@ metaZones:table(nofallback){
             {
                 "Africa_Eastern",
                 "2000-01-15 10:00",
+                "2017-10-31 21:00",
+            }
+            {
+                "Africa_Central",
+                "2017-10-31 21:00",
                 "9999-12-31 23:59",
             }
         }
@@ -1026,6 +1029,18 @@ metaZones:table(nofallback){
         "Africa:Sao_Tome"{
             {
                 "GMT",
+                "1970-01-01 00:00",
+                "2018-01-01 01:00",
+            }
+            {
+                "Africa_Western",
+                "2018-01-01 01:00",
+                "2019-01-01 01:00",
+            }
+            {
+                "GMT",
+                "2019-01-01 01:00",
+                "9999-12-31 23:59",
             }
         }
         "Africa:Tripoli"{
@@ -1079,11 +1094,16 @@ metaZones:table(nofallback){
             {
                 "Africa_Central",
                 "1990-03-20 22:00",
-                "1994-04-02 22:00",
+                "1994-03-20 22:00",
             }
             {
                 "Africa_Western",
-                "1994-04-02 22:00",
+                "1994-03-20 22:00",
+                "2017-10-23 22:00",
+            }
+            {
+                "Africa_Central",
+                "2017-10-23 22:00",
                 "9999-12-31 23:59",
             }
         }
@@ -1638,6 +1658,11 @@ metaZones:table(nofallback){
             {
                 "Atlantic",
                 "2015-11-01 06:00",
+                "2018-03-11 07:00",
+            }
+            {
+                "America_Eastern",
+                "2018-03-11 07:00",
                 "9999-12-31 23:59",
             }
         }
@@ -2056,6 +2081,16 @@ metaZones:table(nofallback){
             {
                 "Alaska",
                 "2015-11-01 10:00",
+                "2018-11-04 10:00",
+            }
+            {
+                "America_Pacific",
+                "2018-11-04 10:00",
+                "2019-01-20 10:00",
+            }
+            {
+                "Alaska",
+                "2019-01-20 10:00",
                 "9999-12-31 23:59",
             }
         }
@@ -2245,6 +2280,13 @@ metaZones:table(nofallback){
                 "Atlantic",
             }
         }
+        "America:Punta_Arenas"{
+            {
+                "Chile",
+                "1970-01-01 00:00",
+                "2016-12-03 23:00",
+            }
+        }
         "America:Rainy_River"{
             {
                 "America_Central",
@@ -2532,6 +2574,11 @@ metaZones:table(nofallback){
             {
                 "Casey",
                 "2016-10-21 16:00",
+                "2018-03-10 17:00",
+            }
+            {
+                "Australia_Western",
+                "2018-03-10 17:00",
                 "9999-12-31 23:59",
             }
         }
@@ -2576,7 +2623,7 @@ metaZones:table(nofallback){
             {
                 "Chile",
                 "1982-05-01 03:00",
-                "9999-12-31 23:59",
+                "2016-12-03 23:00",
             }
         }
         "Antarctica:Rothera"{
@@ -3100,6 +3147,11 @@ metaZones:table(nofallback){
             {
                 "Pyongyang",
                 "2015-08-14 15:00",
+                "2018-05-04 15:00",
+            }
+            {
+                "Korea",
+                "2018-05-04 15:00",
                 "9999-12-31 23:59",
             }
         }
@@ -3115,6 +3167,13 @@ metaZones:table(nofallback){
                 "9999-12-31 23:59",
             }
         }
+        "Asia:Qostanay"{
+            {
+                "Kazakhstan_Eastern",
+                "2004-10-30 21:00",
+                "9999-12-31 23:59",
+            }
+        }
         "Asia:Qyzylorda"{
             {
                 "Kizilorda",
@@ -3129,6 +3188,11 @@ metaZones:table(nofallback){
             {
                 "Kazakhstan_Eastern",
                 "2004-10-30 21:00",
+                "2018-12-20 18:00",
+            }
+            {
+                "Kazakhstan_Western",
+                "2018-12-20 18:00",
                 "9999-12-31 23:59",
             }
         }
@@ -3454,6 +3518,11 @@ metaZones:table(nofallback){
                 "America_Eastern",
             }
         }
+        "Etc:GMT"{
+            {
+                "GMT",
+            }
+        }
         "Europe:Amsterdam"{
             {
                 "Europe_Central",
@@ -3950,6 +4019,11 @@ metaZones:table(nofallback){
             {
                 "Moscow",
                 "1992-03-28 22:00",
+                "2018-10-27 23:00",
+            }
+            {
+                "Volgograd",
+                "2018-10-27 23:00",
                 "9999-12-31 23:59",
             }
         }
@@ -4169,11 +4243,11 @@ metaZones:table(nofallback){
             {
                 "Kwajalein",
                 "1970-01-01 00:00",
-                "1993-08-20 12:00",
+                "1993-08-21 12:00",
             }
             {
                 "Marshall_Islands",
-                "1993-08-20 12:00",
+                "1993-08-21 12:00",
                 "9999-12-31 23:59",
             }
         }