Move CallData onto the JS stack

Change-Id: I22e853acfd2da337344b581bb0412c5f9930c510
Reviewed-by: Simon Hausmann <[email protected]>

1 files changed, 3 insertions, 4 deletions

diff --git a/src/qml/jsruntime/qv4context.cpp b/src/qml/jsruntime/qv4context.cpp
index 29fdc333f8..0ad245f8fc 100644
--- a/src/qml/jsruntime/qv4context.cpp
+++ b/src/qml/jsruntime/qv4context.cpp
@@ -63,7 +63,8 @@ CallContext *ExecutionContext::newCallContext(void *stackSpace, FunctionObject *
     c->initBaseContext(Type_CallContext, engine, this);
 
     c->function = function;
-    c->arguments = d.args;
+    // ###
+    c->arguments = const_cast<Value *>(d.args);
     c->realArgumentCount = d.argc;
     c->argumentCount = d.argc;
     c->thisObject = d.thisObject;
@@ -109,9 +110,7 @@ CallContext *ExecutionContext::newCallContext(FunctionObject *function, const Ca
     c->initBaseContext(Type_CallContext, engine, this);
 
     c->function = function;
-    c->arguments = d.args;
     c->realArgumentCount = d.argc;
-    c->argumentCount = d.argc;
     c->thisObject = d.thisObject;
 
     c->strictMode = function->strictMode;
@@ -138,7 +137,7 @@ CallContext *ExecutionContext::newCallContext(FunctionObject *function, const Ca
     c->argumentCount = qMax((uint)d.argc, function->formalParameterCount);
     c->arguments = c->locals + function->varCount;
     if (d.argc)
-        ::memcpy(c->arguments, d.args, c->realArgumentCount * sizeof(Value));
+        ::memcpy(c->arguments, d.args, d.argc * sizeof(Value));
     if (d.argc < function->formalParameterCount)
         std::fill(c->arguments + d.argc, c->arguments + function->formalParameterCount, Value::undefinedValue());