Merging upstream version 126.0.

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

1 files changed, 9 insertions, 15 deletions

diff --git a/js/src/jit/CacheIRReader.h b/js/src/jit/CacheIRReader.h
index 54b298c999..59483424a3 100644
--- a/js/src/jit/CacheIRReader.h
+++ b/js/src/jit/CacheIRReader.h
@@ -129,21 +129,15 @@ class MOZ_RAII CacheIRReader {
     bool isSameRealm = encoded & CallFlags::IsSameRealm;
     bool needsUninitializedThis = encoded & CallFlags::NeedsUninitializedThis;
     MOZ_ASSERT_IF(needsUninitializedThis, isConstructing);
-    switch (format) {
-      case CallFlags::Unknown:
-        MOZ_CRASH("Unexpected call flags");
-      case CallFlags::Standard:
-        return CallFlags(isConstructing, /*isSpread =*/false, isSameRealm,
-                         needsUninitializedThis);
-      case CallFlags::Spread:
-        return CallFlags(isConstructing, /*isSpread =*/true, isSameRealm,
-                         needsUninitializedThis);
-      default:
-        // The existing non-standard argument formats (FunCall and FunApply)
-        // can't be constructors.
-        MOZ_ASSERT(!isConstructing);
-        return CallFlags(format);
-    }
+
+    // FunCall and FunApply can't be constructors.
+    MOZ_ASSERT_IF(format == CallFlags::FunCall, !isConstructing);
+    MOZ_ASSERT_IF(format == CallFlags::FunApplyArgsObj, !isConstructing);
+    MOZ_ASSERT_IF(format == CallFlags::FunApplyArray, !isConstructing);
+    MOZ_ASSERT_IF(format == CallFlags::FunApplyNullUndefined, !isConstructing);
+
+    return CallFlags(format, isConstructing, isSameRealm,
+                     needsUninitializedThis);
   }
 
   uint8_t readByte() { return buffer_.readByte(); }