[webkit-changes] [261006] trunk/Source/JavaScriptCore

Fri, 01 May 2020 10:26:21 -0700

Title: [261006] trunk/Source/_javascript_Core
Revision
261006
Author
[email protected]
Date
2020-05-01 10:25:02 -0700 (Fri, 01 May 2020)

Log Message

Unreviewed. Non-speculative build fix for watchOS build.

* runtime/ArrayPrototype.cpp:
(JSC::shift):
(JSC::unshift):
(JSC::arrayProtoFuncToLocaleString):
(JSC::arrayProtoFuncReverse):
(JSC::arrayProtoFuncSlice):
(JSC::arrayProtoFuncSplice):
* runtime/JSONObject.cpp:
(JSC::Stringifier::Stringifier):


Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (261005 => 261006)


--- trunk/Source/_javascript_Core/ChangeLog	2020-05-01 17:10:59 UTC (rev 261005)
+++ trunk/Source/_javascript_Core/ChangeLog	2020-05-01 17:25:02 UTC (rev 261006)
@@ -1,5 +1,19 @@
 2020-05-01  Saam Barati  <[email protected]>
 
+        Unreviewed. Non-speculative build fix for watchOS build.
+
+        * runtime/ArrayPrototype.cpp:
+        (JSC::shift):
+        (JSC::unshift):
+        (JSC::arrayProtoFuncToLocaleString):
+        (JSC::arrayProtoFuncReverse):
+        (JSC::arrayProtoFuncSlice):
+        (JSC::arrayProtoFuncSplice):
+        * runtime/JSONObject.cpp:
+        (JSC::Stringifier::Stringifier):
+
+2020-05-01  Saam Barati  <[email protected]>
+
         Unreviewed. Speculative build fix for watchOS build.
 
         * runtime/ArrayPrototype.cpp:

Modified: trunk/Source/_javascript_Core/runtime/ArrayPrototype.cpp (261005 => 261006)


--- trunk/Source/_javascript_Core/runtime/ArrayPrototype.cpp	2020-05-01 17:10:59 UTC (rev 261005)
+++ trunk/Source/_javascript_Core/runtime/ArrayPrototype.cpp	2020-05-01 17:25:02 UTC (rev 261006)
@@ -336,7 +336,7 @@
         JSArray* array = asArray(thisObj);
         uint32_t header32 = static_cast<uint32_t>(header);
         ASSERT(header32 == header);
-        if (array->length() == length && array->shiftCount<shiftCountMode>(globalObject, header32, count))
+        if (array->length() == length && array->shiftCount<shiftCountMode>(globalObject, header32, static_cast<uint32_t>(count)))
             return;
         header = header32;
     }
@@ -394,7 +394,7 @@
 
         JSArray* array = asArray(thisObj);
         if (array->length() == length) {
-            bool handled = array->unshiftCount<shiftCountMode>(globalObject, header, count);
+            bool handled = array->unshiftCount<shiftCountMode>(globalObject, static_cast<uint32_t>(header), static_cast<uint32_t>(count));
             EXCEPTION_ASSERT(!scope.exception() || handled);
             if (handled)
                 return;
@@ -706,7 +706,7 @@
     if (JSValue earlyReturnValue = checker.earlyReturnValue())
         return JSValue::encode(earlyReturnValue);
 
-    JSStringJoiner stringJoiner(globalObject, ',', length);
+    JSStringJoiner stringJoiner(globalObject, ',', static_cast<uint32_t>(length));
     RETURN_IF_EXCEPTION(scope, encodedJSValue());
 
     ArgList arguments(callFrame);
@@ -971,7 +971,7 @@
         if (length > butterfly.publicLength())
             break;
         auto data = ""
-        if (containsHole(data, length) && holesMustForwardToPrototype(vm, thisObject))
+        if (containsHole(data, static_cast<uint32_t>(length)) && holesMustForwardToPrototype(vm, thisObject))
             break;
         std::reverse(data, data + length);
         if (!hasInt32(thisObject->indexingType()))
@@ -983,7 +983,7 @@
         if (length > butterfly.publicLength())
             break;
         auto data = ""
-        if (containsHole(data, length) && holesMustForwardToPrototype(vm, thisObject))
+        if (containsHole(data, static_cast<uint32_t>(length)) && holesMustForwardToPrototype(vm, thisObject))
             break;
         std::reverse(data, data + length);
         return JSValue::encode(thisObject);
@@ -1106,7 +1106,7 @@
     bool okToDoFastPath = speciesResult.first == SpeciesConstructResult::FastPath && isJSArray(thisObj) && length == toLength(globalObject, thisObj);
     RETURN_IF_EXCEPTION(scope, { });
     if (LIKELY(okToDoFastPath)) {
-        if (JSArray* result = asArray(thisObj)->fastSlice(globalObject, begin, end - begin))
+        if (JSArray* result = asArray(thisObj)->fastSlice(globalObject, static_cast<uint32_t>(begin), static_cast<uint32_t>(end - begin)))
             return JSValue::encode(result);
     }
 
@@ -1202,7 +1202,7 @@
     bool okToDoFastPath = speciesResult.first == SpeciesConstructResult::FastPath && isJSArray(thisObj) && length == toLength(globalObject, thisObj);
     RETURN_IF_EXCEPTION(scope, encodedJSValue());
     if (LIKELY(okToDoFastPath))
-        result = asArray(thisObj)->fastSlice(globalObject, actualStart, actualDeleteCount);
+        result = asArray(thisObj)->fastSlice(globalObject, static_cast<uint32_t>(actualStart), static_cast<uint32_t>(actualDeleteCount));
 
     if (!result) {
         if (speciesResult.first == SpeciesConstructResult::CreatedObject)

Modified: trunk/Source/_javascript_Core/runtime/JSONObject.cpp (261005 => 261006)


--- trunk/Source/_javascript_Core/runtime/JSONObject.cpp	2020-05-01 17:10:59 UTC (rev 261005)
+++ trunk/Source/_javascript_Core/runtime/JSONObject.cpp	2020-05-01 17:25:02 UTC (rev 261006)
@@ -240,7 +240,7 @@
                 for (uint64_t index = 0; index < length; ++index) {
                     JSValue name;
                     if (isJSArray(replacerObject) && replacerObject->canGetIndexQuickly(index))
-                        name = replacerObject->getIndexQuickly(index);
+                        name = replacerObject->getIndexQuickly(static_cast<uint32_t>(index));
                     else {
                         name = replacerObject->get(globalObject, index);
                         RETURN_IF_EXCEPTION(scope, );

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to