Always set the correct FunctionObject when calling JS functions

Renamed ScopedCallData to JSCall, enforced passing a JS
FunctionObject to it, and added call() and callAsConstructor()
methods to it.

Change-Id: I30db65c9765c2896b5909fe2105c0934c6dad861
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 9 insertions, 9 deletions

diff --git a/src/qml/jsruntime/qv4jsonobject.cpp b/src/qml/jsruntime/qv4jsonobject.cpp
index 88fc0d6b3c..83cfb434dc 100644
--- a/src/qml/jsruntime/qv4jsonobject.cpp
+++ b/src/qml/jsruntime/qv4jsonobject.cpp
@@ -697,21 +697,21 @@ QString Stringify::Str(const QString &key, const Value &v)
         ScopedString s(scope, v4->newString(QStringLiteral("toJSON")));
         ScopedFunctionObject toJSON(scope, o->get(s));
         if (!!toJSON) {
-            ScopedCallData callData(scope, 1);
-            callData->thisObject = value;
-            callData->args[0] = v4->newString(key);
-            value = toJSON->call(callData);
+            JSCall jsCall(scope, toJSON, 1);
+            jsCall->thisObject = value;
+            jsCall->args[0] = v4->newString(key);
+            value = jsCall.call();
         }
     }
 
     if (replacerFunction) {
         ScopedObject holder(scope, v4->newObject());
         holder->put(scope.engine->id_empty(), value);
-        ScopedCallData callData(scope, 2);
-        callData->args[0] = v4->newString(key);
-        callData->args[1] = value;
-        callData->thisObject = holder;
-        value = replacerFunction->call(callData);
+        JSCall jsCall(scope, replacerFunction, 2);
+        jsCall->args[0] = v4->newString(key);
+        jsCall->args[1] = value;
+        jsCall->thisObject = holder;
+        value = jsCall.call();
     }
 
     o = value->asReturnedValue();