Changeset 249073 in webkit

Timestamp:

Aug 23, 2019, 3:56:58 PM (7 years ago)

Author:

Ross Kirsling

Message:

Unreviewed WinCairo build fix following r249058.

• API/tests/testapi.cpp:

(TestAPI::callFunction):
WinCairo chokes on JSValueRef args[sizeof...(arguments)] when there are no arguments, but AppleWin does not...
MSVC must have changed somehow.

Location:

trunk/Source/JavaScriptCore

Files:

• API/tests/testapi.cpp (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/Source/JavaScriptCore/API/tests/testapi.cpp

@@ -203 +203 @@
 }
 
+#if COMPILER(MSVC)
+template<>
+TestAPI::ScriptResult TestAPI::callFunction(const char* functionSource)
+{
+    JSValueRef function;
+    {
+        ScriptResult functionResult = evaluateScript(functionSource);
+        if (!functionResult)
+            return functionResult;
+        function = functionResult.value();
+    }
+
+    JSValueRef exception = nullptr;
+    if (JSObjectRef functionObject = JSValueToObject(context, function, &exception)) {
+        JSValueRef result = JSObjectCallAsFunction(context, functionObject, functionObject, 0, nullptr, &exception);
+        if (!exception)
+            return ScriptResult(result);
+    }
+
+    RELEASE_ASSERT(exception);
+    return Unexpected<JSValueRef>(exception);
+}
+#endif
+
 template<typename... ArgumentTypes>
 bool TestAPI::functionReturnsTrue(const char* functionSource, ArgumentTypes... arguments)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-08-23  Ross Kirsling  <ross.kirsling@sony.com>
+
+        Unreviewed WinCairo build fix following r249058.
+
+        * API/tests/testapi.cpp:
+        (TestAPI::callFunction):
+        WinCairo chokes on `JSValueRef args[sizeof...(arguments)]` when there are no arguments, but AppleWin does not...
+        MSVC must have changed somehow.
+
 2019-08-23  Justin Michaud  <justin_michaud@apple.com>