Changeset 271217 in webkit

Timestamp:

Jan 6, 2021, 3:39:18 PM (6 years ago)

Author:

ysuzuki@apple.com

Message:

[JSC] Replace JSBigInt::toUint64 with JSBigInt::toBigUInt64
​https://bugs.webkit.org/show_bug.cgi?id=220378

Reviewed by Darin Adler.

Source/JavaScriptCore:

This patch replaces JSBigInt::toUint64 with JSBigInt::toBigUInt64.
Rough purposes of these functions are the same, and JSBigInt::toBigUInt64
has the semantics defined in the ECMA262 spec. While the behavior is
slightly different[1], this difference does not matter for the clients of
JSBigInt::toUint64.

[1]: JSBigInt::toUint64 fails conversion if JSBigInt is out of range of uint64_t,

while JSBigInt::toBigUInt64 always generates uint64_t by computing mod UINT64_MAX.

• runtime/JSBigInt.cpp:

(JSC::JSBigInt::toUint64Heap): Deleted.

• runtime/JSBigInt.h:

Source/WebKit:

• WebProcess/WebPage/IPCTestingAPI.cpp:

(WebKit::IPCTestingAPI::convertToUint64):
(WebKit::IPCTestingAPI::encodeNumericType):

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/runtime/JSBigInt.cpp (modified) (1 diff)
• JavaScriptCore/runtime/JSBigInt.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebProcess/WebPage/IPCTestingAPI.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-01-06  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Replace JSBigInt::toUint64 with JSBigInt::toBigUInt64
+        https://bugs.webkit.org/show_bug.cgi?id=220378
+
+        Reviewed by Darin Adler.
+
+        This patch replaces JSBigInt::toUint64 with JSBigInt::toBigUInt64.
+        Rough purposes of these functions are the same, and  JSBigInt::toBigUInt64
+        has the semantics defined in the ECMA262 spec. While the behavior is
+        slightly different[1], this difference does not matter for the clients of
+        JSBigInt::toUint64.
+
+        [1]: JSBigInt::toUint64 fails conversion if JSBigInt is out of range of uint64_t,
+             while JSBigInt::toBigUInt64 always generates uint64_t by computing mod UINT64_MAX.
+
+        * runtime/JSBigInt.cpp:
+        (JSC::JSBigInt::toUint64Heap): Deleted.
+        * runtime/JSBigInt.h:
+
 2021-01-05  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/JavaScriptCore/runtime/JSBigInt.cpp

@@ -3063 +3063 @@
 }
 
-Optional<uint64_t> JSBigInt::toUint64Heap(JSBigInt* bigInt)
-{
-    auto length = bigInt->length();
-    if (!length)
-        return 0;
-    if (bigInt->sign())
-        return WTF::nullopt;
-
-    static_assert(sizeof(uint64_t) == sizeof(Digit) || sizeof(uint64_t) == sizeof(Digit) * 2, "Digit must be either 32-bit or 64-bit");
-    if (sizeof(uint64_t) == sizeof(Digit)) {
-        if (length > 1)
-            return WTF::nullopt;
-        return bigInt->digit(0);
-    }
-
-    if (length > 2)
-        return WTF::nullopt;
-    uint64_t result = bigInt->digit(0);
-    if (length == 1)
-        result += static_cast<uint64_t>(bigInt->digit(0)) << 32;
-    return result;
-}
-
 static ALWAYS_INLINE unsigned computeHash(JSBigInt::Digit* digits, unsigned length, bool sign)
 {

trunk/Source/JavaScriptCore/runtime/JSBigInt.h

@@ -441 +441 @@
     }
 
-    static Optional<uint64_t> toUint64(JSValue bigInt)
-    {
-        ASSERT(bigInt.isBigInt());
-#if USE(BIGINT32)
-        if (bigInt.isBigInt32()) {
-            auto value = bigInt.bigInt32AsInt32();
-            if (value < 0)
-                return WTF::nullopt;
-            return value;
-        }
-#endif
-        return toUint64Heap(jsCast<JSBigInt*>(bigInt));
-    }
-
     Digit digit(unsigned);
     void setDigit(unsigned, Digit); // Use only when initializing.

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-01-06  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Replace JSBigInt::toUint64 with JSBigInt::toBigUInt64
+        https://bugs.webkit.org/show_bug.cgi?id=220378
+
+        Reviewed by Darin Adler.
+
+        * WebProcess/WebPage/IPCTestingAPI.cpp:
+        (WebKit::IPCTestingAPI::convertToUint64):
+        (WebKit::IPCTestingAPI::encodeNumericType):
+
 2021-01-06  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebKit/WebProcess/WebPage/IPCTestingAPI.cpp

@@ -194 +194 @@
     }
     if (jsValue.isBigInt())
-        return JSC::JSBigInt::toUint64(jsValue);
+        return JSC::JSBigInt::toBigUInt64(jsValue);
     return WTF::nullopt;
 }
@@ -353 +353 @@
     if (jsValue.isBigInt()) {
         // FIXME: Support negative BigInt.
-        auto result = JSC::JSBigInt::toUint64(jsValue);
-        if (!result)
-            return false;
-        encoder << static_cast<IntegralType>(*result);
+        uint64_t result = JSC::JSBigInt::toBigUInt64(jsValue);
+        encoder << static_cast<IntegralType>(result);
         return true;
     }