Changeset 262353 in webkit for trunk/Source/JavaScriptCore/runtime/JSBigInt.cpp

Timestamp:

May 30, 2020, 8:01:08 PM (5 years ago)

Author:

[email protected]

Message:

Unreviewed, fix JSC debug tests' exception checking
​https://bugs.webkit.org/show_bug.cgi?id=212512

• runtime/JSBigInt.cpp:

(JSC::JSBigInt::createWithLength):
(JSC::JSBigInt::allocateFor):

File:

• trunk/Source/JavaScriptCore/runtime/JSBigInt.cpp (modified) (5 diffs)

trunk/Source/JavaScriptCore/runtime/JSBigInt.cpp

@@ -100 +100 @@
 inline JSBigInt* JSBigInt::createWithLength(JSGlobalObject* nullOrGlobalObjectForOOM, VM& vm, unsigned length)
 {
-    auto scope = DECLARE_THROW_SCOPE(vm);
     if (UNLIKELY(length > maxLength)) {
-        if (nullOrGlobalObjectForOOM)
+        if (nullOrGlobalObjectForOOM) {
+            auto scope = DECLARE_THROW_SCOPE(vm);
             throwOutOfMemoryError(nullOrGlobalObjectForOOM, scope, "BigInt generated from this operation is too big"_s);
+        }
         return nullptr;
     }
@@ -110 +111 @@
     void* data = Gigacage::tryMalloc(Gigacage::Primitive, length * sizeof(Digit));
     if (UNLIKELY(!data)) {
-        if (nullOrGlobalObjectForOOM)
+        if (nullOrGlobalObjectForOOM) {
+            auto scope = DECLARE_THROW_SCOPE(vm);
             throwOutOfMemoryError(nullOrGlobalObjectForOOM, scope);
+        }
         return nullptr;
     }
@@ -2333 +2336 @@
 JSBigInt* JSBigInt::allocateFor(JSGlobalObject* nullOrGlobalObjectForOOM, VM& vm, unsigned radix, unsigned charcount)
 {
-    auto scope = DECLARE_THROW_SCOPE(vm);
-
     ASSERT(2 <= radix && radix <= 36);
 
@@ -2349 +2350 @@
             unsigned length = (bitsMin + digitBits - 1) / digitBits;
             if (length <= maxLength)
-                RELEASE_AND_RETURN(scope, createWithLength(nullOrGlobalObjectForOOM, vm, length));
+                return createWithLength(nullOrGlobalObjectForOOM, vm, length);
         }
     }
 
-    if (nullOrGlobalObjectForOOM)
+    if (nullOrGlobalObjectForOOM) {
+        auto scope = DECLARE_THROW_SCOPE(vm);
         throwOutOfMemoryError(nullOrGlobalObjectForOOM, scope, "BigInt generated from this operation is too big"_s);
+    }
 
     return nullptr;
@@ -2562 +2565 @@
             }
             heapResult = allocateFor(nullOrGlobalObjectForOOM, vm, radix, initialLength);
-            if (!heapResult)
+            if (UNLIKELY(!heapResult))
                 return JSValue();
             heapResult->initialize(InitializationType::WithZero);