Merging upstream version 115.9.0esr.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

8 files changed, 32 insertions, 20 deletions

diff --git a/js/src/builtin/intl/TimeZoneDataGenerated.h b/js/src/builtin/intl/TimeZoneDataGenerated.h
index 7757e11402..75e09fc522 100644
--- a/js/src/builtin/intl/TimeZoneDataGenerated.h
+++ b/js/src/builtin/intl/TimeZoneDataGenerated.h
@@ -1,5 +1,5 @@
 // Generated by make_intl_data.py. DO NOT EDIT.
-// tzdata version = 2023c
+// tzdata version = 2024a
 
 #ifndef builtin_intl_TimeZoneDataGenerated_h
 #define builtin_intl_TimeZoneDataGenerated_h
@@ -22,8 +22,14 @@ const char* const ianaZonesTreatedAsLinksByICU[] = {
     "America/Ensenada", // America/Tijuana [backzone]
     "America/Indiana/Indianapolis", // America/Indianapolis [northamerica]
     "America/Kentucky/Louisville", // America/Louisville [northamerica]
+    "America/Montreal", // America/Toronto [backzone]
+    "America/Nipigon", // America/Toronto [backzone]
     "America/Nuuk", // America/Godthab [europe]
+    "America/Pangnirtung", // America/Iqaluit [backzone]
+    "America/Rainy_River", // America/Winnipeg [backzone]
     "America/Rosario", // America/Cordoba [backzone]
+    "America/Thunder_Bay", // America/Toronto [backzone]
+    "America/Yellowknife", // America/Edmonton [backzone]
     "Asia/Chongqing", // Asia/Shanghai [backzone]
     "Asia/Harbin", // Asia/Shanghai [backzone]
     "Asia/Ho_Chi_Minh", // Asia/Saigon [asia]
@@ -34,13 +40,17 @@ const char* const ianaZonesTreatedAsLinksByICU[] = {
     "Asia/Yangon", // Asia/Rangoon [asia]
     "Atlantic/Faroe", // Atlantic/Faeroe [europe]
     "Atlantic/Jan_Mayen", // Arctic/Longyearbyen [backzone]
+    "Australia/Currie", // Australia/Hobart [backzone]
     "EST", // Etc/GMT+5 [northamerica]
     "Europe/Belfast", // Europe/London [backzone]
     "Europe/Kyiv", // Europe/Kiev [europe]
     "Europe/Tiraspol", // Europe/Chisinau [backzone]
+    "Europe/Uzhgorod", // Europe/Kiev [backzone]
+    "Europe/Zaporozhye", // Europe/Kiev [backzone]
     "HST", // Etc/GMT+10 [northamerica]
     "MST", // Etc/GMT+7 [northamerica]
     "Pacific/Chuuk", // Pacific/Truk [backzone]
+    "Pacific/Johnston", // Pacific/Honolulu [backzone]
     "Pacific/Kanton", // Pacific/Enderbury [australasia]
     "Pacific/Pohnpei", // Pacific/Ponape [backzone]
 };
@@ -67,7 +77,6 @@ const LinkAndTarget ianaLinksCanonicalizedDifferentlyByICU[] = {
     { "America/Lower_Princes", "America/Curacao" }, // America/Lower_Princes [backward]
     { "America/Marigot", "America/Port_of_Spain" }, // America/Marigot [backward]
     { "America/Mendoza", "America/Argentina/Mendoza" }, // America/Mendoza [backward]
-    { "America/Santa_Isabel", "America/Tijuana" }, // America/Santa_Isabel [backward]
     { "America/St_Barthelemy", "America/Port_of_Spain" }, // America/St_Barthelemy [backward]
     { "Antarctica/South_Pole", "Antarctica/McMurdo" }, // Pacific/Auckland [backward]
     { "Arctic/Longyearbyen", "Europe/Oslo" }, // Arctic/Longyearbyen [backward]
diff --git a/js/src/jit/arm/MacroAssembler-arm.cpp b/js/src/jit/arm/MacroAssembler-arm.cpp
index fe4f36ab26..b031461751 100644
--- a/js/src/jit/arm/MacroAssembler-arm.cpp
+++ b/js/src/jit/arm/MacroAssembler-arm.cpp
@@ -5843,11 +5843,13 @@ inline void EmitRemainderOrQuotient(bool isRemainder, MacroAssembler& masm,
       masm.quotient32(rhs, lhsOutput, isUnsigned);
     }
   } else {
-    // Ensure that the output registers are saved and restored properly,
-    MOZ_ASSERT(volatileLiveRegs.has(ReturnRegVal0));
-    MOZ_ASSERT(volatileLiveRegs.has(ReturnRegVal1));
+    // Ensure that the output registers are saved and restored properly.
+    LiveRegisterSet liveRegs = volatileLiveRegs;
+    liveRegs.addUnchecked(ReturnRegVal0);
+    liveRegs.addUnchecked(ReturnRegVal1);
+
+    masm.PushRegsInMask(liveRegs);
 
-    masm.PushRegsInMask(volatileLiveRegs);
     using Fn = int64_t (*)(int, int);
     {
       ScratchRegisterScope scratch(masm);
@@ -5870,7 +5872,7 @@ inline void EmitRemainderOrQuotient(bool isRemainder, MacroAssembler& masm,
 
     LiveRegisterSet ignore;
     ignore.add(lhsOutput);
-    masm.PopRegsInMaskIgnore(volatileLiveRegs, ignore);
+    masm.PopRegsInMaskIgnore(liveRegs, ignore);
   }
 }
 
@@ -5899,10 +5901,12 @@ void MacroAssembler::flexibleDivMod32(Register rhs, Register lhsOutput,
     remainder32(rhs, remOutput, isUnsigned);
     quotient32(rhs, lhsOutput, isUnsigned);
   } else {
-    // Ensure that the output registers are saved and restored properly,
-    MOZ_ASSERT(volatileLiveRegs.has(ReturnRegVal0));
-    MOZ_ASSERT(volatileLiveRegs.has(ReturnRegVal1));
-    PushRegsInMask(volatileLiveRegs);
+    // Ensure that the output registers are saved and restored properly.
+    LiveRegisterSet liveRegs = volatileLiveRegs;
+    liveRegs.addUnchecked(ReturnRegVal0);
+    liveRegs.addUnchecked(ReturnRegVal1);
+
+    PushRegsInMask(liveRegs);
 
     using Fn = int64_t (*)(int, int);
     {
@@ -5923,7 +5927,7 @@ void MacroAssembler::flexibleDivMod32(Register rhs, Register lhsOutput,
     LiveRegisterSet ignore;
     ignore.add(remOutput);
     ignore.add(lhsOutput);
-    PopRegsInMaskIgnore(volatileLiveRegs, ignore);
+    PopRegsInMaskIgnore(liveRegs, ignore);
   }
 }
 
diff --git a/js/src/tests/non262/Intl/DateTimeFormat/timeZone_backward_links.js b/js/src/tests/non262/Intl/DateTimeFormat/timeZone_backward_links.js
index 234616bfd9..5f10b8f65e 100644
--- a/js/src/tests/non262/Intl/DateTimeFormat/timeZone_backward_links.js
+++ b/js/src/tests/non262/Intl/DateTimeFormat/timeZone_backward_links.js
@@ -1,7 +1,7 @@
 // |reftest| skip-if(!this.hasOwnProperty("Intl"))
 
 // Generated by make_intl_data.py. DO NOT EDIT.
-// tzdata version = 2023c
+// tzdata version = 2024a
 
 const tzMapper = [
     x => x,
diff --git a/js/src/tests/non262/Intl/DateTimeFormat/timeZone_backzone.js b/js/src/tests/non262/Intl/DateTimeFormat/timeZone_backzone.js
index 0c5882deca..15e5e6af4b 100644
--- a/js/src/tests/non262/Intl/DateTimeFormat/timeZone_backzone.js
+++ b/js/src/tests/non262/Intl/DateTimeFormat/timeZone_backzone.js
@@ -1,7 +1,7 @@
 // |reftest| skip-if(!this.hasOwnProperty("Intl"))
 
 // Generated by make_intl_data.py. DO NOT EDIT.
-// tzdata version = 2023c
+// tzdata version = 2024a
 
 const tzMapper = [
     x => x,
@@ -81,7 +81,6 @@ const links = {
     "Antarctica/DumontDUrville": "Antarctica/DumontDUrville",
     "Antarctica/McMurdo": "Antarctica/McMurdo",
     "Antarctica/Syowa": "Antarctica/Syowa",
-    "Antarctica/Vostok": "Antarctica/Vostok",
     "Asia/Aden": "Asia/Aden",
     "Asia/Bahrain": "Asia/Bahrain",
     "Asia/Brunei": "Asia/Brunei",
diff --git a/js/src/tests/non262/Intl/DateTimeFormat/timeZone_backzone_links.js b/js/src/tests/non262/Intl/DateTimeFormat/timeZone_backzone_links.js
index 15806dd42c..df3e6c58af 100644
--- a/js/src/tests/non262/Intl/DateTimeFormat/timeZone_backzone_links.js
+++ b/js/src/tests/non262/Intl/DateTimeFormat/timeZone_backzone_links.js
@@ -1,7 +1,7 @@
 // |reftest| skip-if(!this.hasOwnProperty("Intl"))
 
 // Generated by make_intl_data.py. DO NOT EDIT.
-// tzdata version = 2023c
+// tzdata version = 2024a
 
 const tzMapper = [
     x => x,
diff --git a/js/src/tests/non262/Intl/DateTimeFormat/timeZone_notbackward_links.js b/js/src/tests/non262/Intl/DateTimeFormat/timeZone_notbackward_links.js
index 7dbd456c2e..864505f546 100644
--- a/js/src/tests/non262/Intl/DateTimeFormat/timeZone_notbackward_links.js
+++ b/js/src/tests/non262/Intl/DateTimeFormat/timeZone_notbackward_links.js
@@ -1,7 +1,7 @@
 // |reftest| skip-if(!this.hasOwnProperty("Intl"))
 
 // Generated by make_intl_data.py. DO NOT EDIT.
-// tzdata version = 2023c
+// tzdata version = 2024a
 
 const tzMapper = [
     x => x,
diff --git a/js/src/tests/non262/Intl/DateTimeFormat/timeZone_version.js b/js/src/tests/non262/Intl/DateTimeFormat/timeZone_version.js
index 15c7553dd8..915b1537ca 100644
--- a/js/src/tests/non262/Intl/DateTimeFormat/timeZone_version.js
+++ b/js/src/tests/non262/Intl/DateTimeFormat/timeZone_version.js
@@ -1,8 +1,8 @@
 // |reftest| skip-if(!this.hasOwnProperty("Intl"))
 
 // Generated by make_intl_data.py. DO NOT EDIT.
-// tzdata version = 2023c
-const tzdata = "2023c";
+// tzdata version = 2024a
+const tzdata = "2024a";
 
 if (typeof getICUOptions === "undefined") {
     var getICUOptions = SpecialPowers.Cu.getJSTestingFunctions().getICUOptions;
diff --git a/js/src/tests/non262/Intl/supportedValuesOf-timeZones-canonical.js b/js/src/tests/non262/Intl/supportedValuesOf-timeZones-canonical.js
index 333f220038..c134858f5c 100644
--- a/js/src/tests/non262/Intl/supportedValuesOf-timeZones-canonical.js
+++ b/js/src/tests/non262/Intl/supportedValuesOf-timeZones-canonical.js
@@ -1,7 +1,7 @@
 // |reftest| skip-if(!this.hasOwnProperty("Intl"))
 
 // Generated by make_intl_data.py. DO NOT EDIT.
-// tzdata version = 2023c
+// tzdata version = 2024a
 
 // This file was generated with historical, pre-1970 backzone information
 // respected.