Move CallData onto the JS stack

Change-Id: I22e853acfd2da337344b581bb0412c5f9930c510
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 6 insertions, 7 deletions

diff --git a/src/qml/qml/qqmljavascriptexpression.cpp b/src/qml/qml/qqmljavascriptexpression.cpp
index 41be44a0a7..2974bbcfbe 100644
--- a/src/qml/qml/qqmljavascriptexpression.cpp
+++ b/src/qml/qml/qqmljavascriptexpression.cpp
@@ -47,6 +47,7 @@
 #include <private/qv4functionobject_p.h>
 #include <private/qv4script_p.h>
 #include <private/qv4errorobject_p.h>
+#include <private/qv4scopedvalue_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -125,8 +126,7 @@ QV4::Value
 QQmlJavaScriptExpression::evaluate(QQmlContextData *context,
                                    const QV4::Value &function, bool *isUndefined)
 {
-    QV4::Value args[QV4::Global::ReservedArgumentCount];
-    return evaluate(context, function, 0, args, isUndefined);
+    return evaluate(context, function, 0, 0, isUndefined);
 }
 
 QV4::Value
@@ -173,11 +173,10 @@ QQmlJavaScriptExpression::evaluate(QQmlContextData *context,
                 This = value;
         }
 
-        QV4::CallData d;
-        d.thisObject = This;
-        d.args = args;
-        d.argc = argc;
-        result = function.asFunctionObject()->call(d);
+        QV4::ScopedCallData callData(v4, argc);
+        callData->thisObject = This;
+        memcpy(callData->args, args, argc*sizeof(QV4::Value));
+        result = function.asFunctionObject()->call(callData);
 
         if (isUndefined)
             *isUndefined = result.isUndefined();