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>

6 files changed, 31 insertions, 34 deletions

diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp
index 20c84b34e6..ba2f37eb2d 100644
--- a/src/qml/qml/qqmlboundsignal.cpp
+++ b/src/qml/qml/qqmlboundsignal.cpp
@@ -193,35 +193,35 @@ void QQmlBoundSignalExpression::evaluate(void **a)
     int *argsTypes = QQmlMetaObject(m_target).methodParameterTypes(methodIndex, &storage, 0);
     int argCount = argsTypes ? *argsTypes : 0;
 
-    QV4::ScopedCallData callData(scope, argCount);
+    QV4::JSCall jsCall(scope, nullptr, argCount);
     for (int ii = 0; ii < argCount; ++ii) {
         int type = argsTypes[ii + 1];
         //### ideally we would use metaTypeToJS, however it currently gives different results
         //    for several cases (such as QVariant type and QObject-derived types)
         //args[ii] = engine->metaTypeToJS(type, a[ii + 1]);
         if (type == qMetaTypeId<QJSValue>()) {
-            if (QV4::Value *v4Value = QJSValuePrivate::valueForData(reinterpret_cast<QJSValue *>(a[ii + 1]), &callData->args[ii]))
-                callData->args[ii] = *v4Value;
+            if (QV4::Value *v4Value = QJSValuePrivate::valueForData(reinterpret_cast<QJSValue *>(a[ii + 1]), &jsCall->args[ii]))
+                jsCall->args[ii] = *v4Value;
             else
-                callData->args[ii] = QV4::Encode::undefined();
+                jsCall->args[ii] = QV4::Encode::undefined();
         } else if (type == QMetaType::QVariant) {
-            callData->args[ii] = scope.engine->fromVariant(*((QVariant *)a[ii + 1]));
+            jsCall->args[ii] = scope.engine->fromVariant(*((QVariant *)a[ii + 1]));
         } else if (type == QMetaType::Int) {
             //### optimization. Can go away if we switch to metaTypeToJS, or be expanded otherwise
-            callData->args[ii] = QV4::Primitive::fromInt32(*reinterpret_cast<const int*>(a[ii + 1]));
+            jsCall->args[ii] = QV4::Primitive::fromInt32(*reinterpret_cast<const int*>(a[ii + 1]));
         } else if (type == qMetaTypeId<QQmlV4Handle>()) {
-            callData->args[ii] = *reinterpret_cast<QQmlV4Handle *>(a[ii + 1]);
+            jsCall->args[ii] = *reinterpret_cast<QQmlV4Handle *>(a[ii + 1]);
         } else if (ep->isQObject(type)) {
             if (!*reinterpret_cast<void* const *>(a[ii + 1]))
-                callData->args[ii] = QV4::Primitive::nullValue();
+                jsCall->args[ii] = QV4::Primitive::nullValue();
             else
-                callData->args[ii] = QV4::QObjectWrapper::wrap(ep->v4engine(), *reinterpret_cast<QObject* const *>(a[ii + 1]));
+                jsCall->args[ii] = QV4::QObjectWrapper::wrap(ep->v4engine(), *reinterpret_cast<QObject* const *>(a[ii + 1]));
         } else {
-            callData->args[ii] = scope.engine->fromVariant(QVariant(type, a[ii + 1]));
+            jsCall->args[ii] = scope.engine->fromVariant(QVariant(type, a[ii + 1]));
         }
     }
 
-    QQmlJavaScriptExpression::evaluate(callData, 0);
+    QQmlJavaScriptExpression::evaluate(jsCall, 0);
 
     ep->dereferenceScarceResources(); // "release" scarce resources if top-level expression evaluation is complete.
 }
@@ -238,12 +238,12 @@ void QQmlBoundSignalExpression::evaluate(const QList<QVariant> &args)
 
     ep->referenceScarceResources(); // "hold" scarce resources in memory during evaluation.
 
-    QV4::ScopedCallData callData(scope, args.count());
+    QV4::JSCall jsCall(scope, nullptr, args.count());
     for (int ii = 0; ii < args.count(); ++ii) {
-        callData->args[ii] = scope.engine->fromVariant(args[ii]);
+        jsCall->args[ii] = scope.engine->fromVariant(args[ii]);
     }
 
-    QQmlJavaScriptExpression::evaluate(callData, 0);
+    QQmlJavaScriptExpression::evaluate(jsCall, 0);
 
     ep->dereferenceScarceResources(); // "release" scarce resources if top-level expression evaluation is complete.
 }
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp
index 4affc5a453..dd0d2096ce 100644
--- a/src/qml/qml/qqmlcomponent.cpp
+++ b/src/qml/qml/qqmlcomponent.cpp
@@ -1547,10 +1547,10 @@ void QV4::QmlIncubatorObject::statusChanged(QQmlIncubator::Status s)
 
     QV4::ScopedFunctionObject f(scope, d()->statusChanged);
     if (f) {
-        QV4::ScopedCallData callData(scope, 1);
-        callData->thisObject = this;
-        callData->args[0] = QV4::Primitive::fromUInt32(s);
-        f->call(callData);
+        QV4::JSCall jsCall(scope, f, 1);
+        jsCall->thisObject = this;
+        jsCall->args[0] = QV4::Primitive::fromUInt32(s);
+        jsCall.call();
         if (scope.hasException()) {
             QQmlError error = scope.engine->catchExceptionAsQmlError();
             QQmlEnginePrivate::warning(QQmlEnginePrivate::get(scope.engine->qmlEngine()), error);
diff --git a/src/qml/qml/qqmldelayedcallqueue.cpp b/src/qml/qml/qqmldelayedcallqueue.cpp
index 87b6fac10e..1537657e0d 100644
--- a/src/qml/qml/qqmldelayedcallqueue.cpp
+++ b/src/qml/qml/qqmldelayedcallqueue.cpp
@@ -64,17 +64,17 @@ void QQmlDelayedCallQueue::DelayedFunctionCall::execute(QV4::ExecutionEngine *en
         QV4::Scope scope(engine);
 
         QV4::ArrayObject *array = m_args.as<QV4::ArrayObject>();
+        const QV4::FunctionObject *callback = m_function.as<QV4::FunctionObject>();
+        Q_ASSERT(callback);
         const int argCount = array ? array->getLength() : 0;
-        QV4::ScopedCallData callData(scope, argCount);
-        callData->thisObject = QV4::Encode::undefined();
+        QV4::JSCall jsCall(scope, callback, argCount);
+        jsCall->thisObject = QV4::Encode::undefined();
 
         for (int i = 0; i < argCount; i++) {
-            callData->args[i] = array->getIndexed(i);
+            jsCall->args[i] = array->getIndexed(i);
         }
 
-        const QV4::FunctionObject *callback = m_function.as<QV4::FunctionObject>();
-        Q_ASSERT(callback);
-        callback->call(callData);
+        jsCall.call();
 
         if (scope.engine->hasException) {
             QQmlError error = scope.engine->catchExceptionAsQmlError();
diff --git a/src/qml/qml/qqmljavascriptexpression.cpp b/src/qml/qml/qqmljavascriptexpression.cpp
index 36881f02ba..e40795283a 100644
--- a/src/qml/qml/qqmljavascriptexpression.cpp
+++ b/src/qml/qml/qqmljavascriptexpression.cpp
@@ -185,9 +185,9 @@ QV4::ReturnedValue QQmlJavaScriptExpression::evaluate(bool *isUndefined)
 {
     QV4::ExecutionEngine *v4 = QV8Engine::getV4(m_context->engine);
     QV4::Scope scope(v4);
-    QV4::ScopedCallData callData(scope);
+    QV4::JSCall jsCall(scope, nullptr);
 
-    return evaluate(callData, isUndefined);
+    return evaluate(jsCall, isUndefined);
 }
 
 QV4::ReturnedValue QQmlJavaScriptExpression::evaluate(QV4::CallData *callData, bool *isUndefined)
diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp
index 3510367fd3..2b54819ad0 100644
--- a/src/qml/qml/qqmlvmemetaobject.cpp
+++ b/src/qml/qml/qqmlvmemetaobject.cpp
@@ -951,14 +951,13 @@ int QQmlVMEMetaObject::metaCall(QObject *o, QMetaObject::Call c, int _id, void *
                 }
 
                 const unsigned int parameterCount = function->formalParameterCount();
-                QV4::ScopedCallData callData(scope, parameterCount);
-                callData->thisObject = ep->v8engine()->global();
+                QV4::JSCall jsCall(scope, function, parameterCount);
+                jsCall->thisObject = ep->v8engine()->global();
 
                 for (uint ii = 0; ii < parameterCount; ++ii)
-                    callData->args[ii] = scope.engine->fromVariant(*(QVariant *)a[ii + 1]);
+                    jsCall->args[ii] = scope.engine->fromVariant(*(QVariant *)a[ii + 1]);
 
-                QV4::ScopedValue result(scope);
-                result = function->call(callData);
+                QV4::ScopedValue result(scope, jsCall.call());
                 if (scope.hasException()) {
                     QQmlError error = scope.engine->catchExceptionAsQmlError();
                     if (error.isValid())
diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp
index a77c4c5678..21f1fb30b0 100644
--- a/src/qml/qml/qqmlxmlhttprequest.cpp
+++ b/src/qml/qml/qqmlxmlhttprequest.cpp
@@ -1576,9 +1576,7 @@ void QQmlXMLHttpRequest::dispatchCallback(Object *thisObj, QQmlContextData *cont
         return;
     }
 
-    QV4::ScopedCallData callData(scope);
-    callData->thisObject = Encode::undefined();
-    callback->call(callData);
+    QV4::JSCall(scope, callback).call();
 
     if (scope.engine->hasException) {
         QQmlError error = scope.engine->catchExceptionAsQmlError();