Further cleanup JSCallData

Avoid allocations on the JS stack if possible

Change-Id: I344cd6dceb6264314f9d22c94db22b22d1d24d14
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>

1 files changed, 8 insertions, 6 deletions

diff --git a/src/qml/jsruntime/qv4globalobject.cpp b/src/qml/jsruntime/qv4globalobject.cpp
index 4e96b01185..f962aa29bc 100644
--- a/src/qml/jsruntime/qv4globalobject.cpp
+++ b/src/qml/jsruntime/qv4globalobject.cpp
@@ -376,9 +376,9 @@ ReturnedValue EvalFunction::evalCall(CallData *callData, bool directCall) const
         ScopedFunctionObject e(scope, FunctionObject::createScriptFunction(ctx, function));
         JSCallData jsCallData(scope, 0);
         if (directCall)
-            jsCallData->thisObject = scope.engine->currentStackFrame->thisObject();
+            *jsCallData->thisObject = scope.engine->currentStackFrame->thisObject();
         else
-            jsCallData->thisObject = scope.engine->globalObject;
+            *jsCallData->thisObject = scope.engine->globalObject;
         return e->call(jsCallData);
     }
 
@@ -387,10 +387,12 @@ ReturnedValue EvalFunction::evalCall(CallData *callData, bool directCall) const
     // set the correct v4 function for the context
     ctx->d()->v4Function = function;
 
-    JSCallData jsCall(scope);
-    jsCall->thisObject = scope.engine->currentStackFrame->thisObject();
-    jsCall->context = *ctx;
-    return function->call(jsCall.callData());
+    JSCallData jsCallData(scope);
+    *jsCallData->thisObject = scope.engine->currentStackFrame->thisObject();
+    CallData *cData = jsCallData.callData();
+    cData->context = *ctx;
+
+    return function->call(cData);
 }