Generate CallData structures directly in the instruction selection

Like this we can hand the CallData through the runtime methods
without any need to modify them. This simplifies the code in there,
and should also speed them up to some degree.

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

6 files changed, 126 insertions, 119 deletions

diff --git a/src/qml/jsruntime/qv4object.cpp b/src/qml/jsruntime/qv4object.cpp
index c99b48191a..fbee25e68b 100644
--- a/src/qml/jsruntime/qv4object.cpp
+++ b/src/qml/jsruntime/qv4object.cpp
@@ -1247,6 +1247,9 @@ void Object::arraySort(ExecutionContext *context, Object *thisObject, const Valu
         }
     }
 
+    if (!(comparefn.isUndefined() || comparefn.asObject()))
+        context->throwTypeError();
+
     ArrayElementLessThan lessThan(context, thisObject, comparefn);
 
     Property *begin = arrayData;
diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp
index 649baaf441..ca6540b920 100644
--- a/src/qml/jsruntime/qv4runtime.cpp
+++ b/src/qml/jsruntime/qv4runtime.cpp
@@ -720,8 +720,10 @@ Bool __qmljs_strict_equal(const Value &x, const Value &y)
 }
 
 
-void __qmljs_call_global_lookup(ExecutionContext *context, Value *result, uint index, Value *args, int argc)
+void __qmljs_call_global_lookup(ExecutionContext *context, Value *result, uint index, CallData *callData)
 {
+    Q_ASSERT(callData->thisObject.isUndefined());
+
     Lookup *l = context->lookups + index;
     Value v;
     l->globalGetter(l, context, &v);
@@ -729,28 +731,28 @@ void __qmljs_call_global_lookup(ExecutionContext *context, Value *result, uint i
     if (!o)
         context->throwTypeError();
 
-    Value thisObject = Value::undefinedValue();
-
     if (o == context->engine->evalFunction && l->name->isEqualTo(context->engine->id_eval)) {
-        Value res = static_cast<EvalFunction *>(o)->evalCall(thisObject, args, argc, true);
+        Value res = static_cast<EvalFunction *>(o)->evalCall(callData->thisObject, callData->args, callData->argc, true);
         if (result)
             *result = res;
         return;
     }
 
-    ScopedCallData d(context->engine, argc);
-    d->thisObject = thisObject;
-    memcpy(d->args, args, argc*sizeof(Value));
-    Value res = o->call(d);
+    Value res = o->call(*callData);
     if (result)
         *result = res;
 }
 
 
-void __qmljs_call_activation_property(ExecutionContext *context, Value *result, String *name, Value *args, int argc)
+void __qmljs_call_activation_property(ExecutionContext *context, Value *result, String *name, CallData *callData)
 {
+    Q_ASSERT(callData->thisObject.isUndefined());
+
     Object *base;
     Value func = context->getPropertyAndBase(name, &base);
+    if (base)
+        callData->thisObject = Value::fromObject(base);
+
     FunctionObject *o = func.asFunctionObject();
     if (!o) {
         QString objectAsString = QStringLiteral("[null]");
@@ -760,106 +762,88 @@ void __qmljs_call_activation_property(ExecutionContext *context, Value *result,
         context->throwTypeError(msg);
     }
 
-    Value thisObject = base ? Value::fromObject(base) : Value::undefinedValue();
-
     if (o == context->engine->evalFunction && name->isEqualTo(context->engine->id_eval)) {
-        Value res = static_cast<EvalFunction *>(o)->evalCall(thisObject, args, argc, true);
+        Value res = static_cast<EvalFunction *>(o)->evalCall(callData->thisObject, callData->args, callData->argc, true);
         if (result)
             *result = res;
         return;
     }
 
-    ScopedCallData d(context->engine, argc);
-    d->thisObject = thisObject;
-    memcpy(d->args, args, argc*sizeof(Value));
-    Value res = o->call(d);
+    Value res = o->call(*callData);
     if (result)
         *result = res;
 }
 
-void __qmljs_call_property(ExecutionContext *context, Value *result, const Value &thatObject, String *name, Value *args, int argc)
+void __qmljs_call_property(ExecutionContext *context, Value *result, String *name, CallData *callData)
 {
-    Value thisObject = thatObject;
-    Managed *baseObject = thisObject.asManaged();
+    Managed *baseObject = callData->thisObject.asManaged();
     if (!baseObject) {
-        if (thisObject.isNull() || thisObject.isUndefined()) {
-            QString message = QStringLiteral("Cannot call method '%1' of %2").arg(name->toQString()).arg(thisObject.toQString());
+        if (callData->thisObject.isNullOrUndefined()) {
+            QString message = QStringLiteral("Cannot call method '%1' of %2").arg(name->toQString()).arg(callData->thisObject.toQString());
             context->throwTypeError(message);
         }
 
-        baseObject = __qmljs_convert_to_object(context, thisObject);
-        thisObject = Value::fromObject(static_cast<Object *>(baseObject));
+        baseObject = __qmljs_convert_to_object(context, callData->thisObject);
+        callData->thisObject = Value::fromObject(static_cast<Object *>(baseObject));
     }
 
-    Value func = baseObject->get(name);
-    FunctionObject *o = func.asFunctionObject();
+    FunctionObject *o = baseObject->get(name).asFunctionObject();
     if (!o) {
-        QString error = QString("Property '%1' of object %2 is not a function").arg(name->toQString(), thisObject.toQString());
+        QString error = QString("Property '%1' of object %2 is not a function").arg(name->toQString(), callData->thisObject.toQString());
         context->throwTypeError(error);
     }
 
-    ScopedCallData d(context->engine, argc);
-    d->thisObject = thisObject;
-    memcpy(d->args, args, argc*sizeof(Value));
-    Value res = o->call(d);
+    Value res = o->call(*callData);
     if (result)
         *result = res;
 }
 
-void __qmljs_call_property_lookup(ExecutionContext *context, Value *result, const Value &thisObject, uint index, Value *args, int argc)
+void __qmljs_call_property_lookup(ExecutionContext *context, Value *result, uint index, CallData *callData)
 {
     Value func;
 
     Lookup *l = context->lookups + index;
-    l->getter(l, &func, thisObject);
+    l->getter(l, &func, callData->thisObject);
 
     Object *o = func.asObject();
     if (!o)
         context->throwTypeError();
 
-    ScopedCallData d(context->engine, argc);
-    d->thisObject = thisObject;
-    memcpy(d->args, args, argc*sizeof(Value));
-    Value res = o->call(d);
+    Value res = o->call(*callData);
     if (result)
         *result = res;
 }
 
-void __qmljs_call_element(ExecutionContext *context, Value *result, const Value &that, const Value &index, Value *args, int argc)
+void __qmljs_call_element(ExecutionContext *context, Value *result, const Value &index, CallData *callData)
 {
-    Object *baseObject = that.toObject(context);
-    Value thisObject = Value::fromObject(baseObject);
+    Object *baseObject = callData->thisObject.toObject(context);
+    callData->thisObject = Value::fromObject(baseObject);
 
-    Value func = baseObject->get(index.toString(context));
-    Object *o = func.asObject();
+    Object *o = baseObject->get(index.toString(context)).asObject();
     if (!o)
         context->throwTypeError();
 
-    ScopedCallData d(context->engine, argc);
-    d->thisObject = thisObject;
-    memcpy(d->args, args, argc*sizeof(Value));
-    Value res = o->call(d);
+    Value res = o->call(*callData);
     if (result)
         *result = res;
 }
 
-void __qmljs_call_value(ExecutionContext *context, Value *result, const Value *thisObject, const Value &func, Value *args, int argc)
+void __qmljs_call_value(ExecutionContext *context, Value *result, const Value &func, CallData *callData)
 {
     Object *o = func.asObject();
     if (!o)
         context->throwTypeError();
 
-    ScopedCallData d(context->engine, argc);
-    d->thisObject = thisObject ? *thisObject : Value::undefinedValue();
-    memcpy(d->args, args, argc*sizeof(Value));
-    Value res = o->call(d);
+    Value res = o->call(*callData);
     if (result)
         *result = res;
 }
 
 
-void __qmljs_construct_global_lookup(ExecutionContext *context, Value *result, uint index, Value *args, int argc)
+void __qmljs_construct_global_lookup(ExecutionContext *context, Value *result, uint index, CallData *callData)
 {
+    Q_ASSERT(callData->thisObject.isUndefined());
+
     Value func;
 
     Lookup *l = context->lookups + index;
@@ -869,49 +853,47 @@ void __qmljs_construct_global_lookup(ExecutionContext *context, Value *result, u
     if (!f)
         context->throwTypeError();
 
-    ScopedCallData callData(context->engine, argc);
-    memcpy(callData->args, args, argc*sizeof(Value));
-    Value res = f->construct(callData);
+    Value res = f->construct(*callData);
     if (result)
         *result = res;
 }
 
 
-void __qmljs_construct_activation_property(ExecutionContext *context, Value *result, String *name, Value *args, int argc)
+void __qmljs_construct_activation_property(ExecutionContext *context, Value *result, String *name, CallData *callData)
 {
     Value func = context->getProperty(name);
-    __qmljs_construct_value(context, result, func, args, argc);
+    Object *f = func.asObject();
+    if (!f)
+        context->throwTypeError();
+
+    Value res = f->construct(*callData);
+    if (result)
+        *result = res;
 }
 
-void __qmljs_construct_value(ExecutionContext *context, Value *result, const Value &func, Value *args, int argc)
+void __qmljs_construct_value(ExecutionContext *context, Value *result, const Value &func, CallData *callData)
 {
-    if (Object *f = func.asObject()) {
-        ScopedCallData d(context->engine, argc);
-        memcpy(d->args, args, argc*sizeof(Value));
-        Value res = f->construct(d);
-        if (result)
-            *result = res;
-        return;
-    }
+    Object *f = func.asObject();
+    if (!f)
+        context->throwTypeError();
 
-    context->throwTypeError();
+    Value res = f->construct(*callData);
+    if (result)
+        *result = res;
 }
 
-void __qmljs_construct_property(ExecutionContext *context, Value *result, const Value &base, String *name, Value *args, int argc)
+void __qmljs_construct_property(ExecutionContext *context, Value *result, const Value &base, String *name, CallData *callData)
 {
     Object *thisObject = base.toObject(context);
 
     Value func = thisObject->get(name);
-    if (Object *f = func.asObject()) {
-        ScopedCallData d(context->engine, argc);
-        memcpy(d->args, args, argc*sizeof(Value));
-        Value res = f->construct(d);
-        if (result)
-            *result = res;
-        return;
-    }
+    Object *f = func.asObject();
+    if (!f)
+        context->throwTypeError();
 
-    context->throwTypeError();
+    Value res = f->construct(*callData);
+    if (result)
+        *result = res;
 }
 
 void __qmljs_throw(ExecutionContext *context, const Value &value)
diff --git a/src/qml/jsruntime/qv4runtime_p.h b/src/qml/jsruntime/qv4runtime_p.h
index b38f833ad0..c52a79e2f5 100644
--- a/src/qml/jsruntime/qv4runtime_p.h
+++ b/src/qml/jsruntime/qv4runtime_p.h
@@ -91,15 +91,15 @@ struct ExecutionEngine;
 struct InternalClass;
 
 // context
-void __qmljs_call_activation_property(QV4::ExecutionContext *, QV4::Value *result, QV4::String *name, QV4::Value *args, int argc);
-void __qmljs_call_property(QV4::ExecutionContext *context, QV4::Value *result, const QV4::Value &that, QV4::String *name, QV4::Value *args, int argc);
-void __qmljs_call_property_lookup(QV4::ExecutionContext *context, QV4::Value *result, const QV4::Value &thisObject, uint index, QV4::Value *args, int argc);
-void __qmljs_call_element(QV4::ExecutionContext *context, QV4::Value *result, const QV4::Value &that, const QV4::Value &index, QV4::Value *args, int argc);
-void __qmljs_call_value(QV4::ExecutionContext *context, QV4::Value *result, const QV4::Value *thisObject, const QV4::Value &func, QV4::Value *args, int argc);
+void __qmljs_call_activation_property(QV4::ExecutionContext *, QV4::Value *result, QV4::String *name, CallData *callData);
+void __qmljs_call_property(QV4::ExecutionContext *context, QV4::Value *result, QV4::String *name, CallData *callData);
+void __qmljs_call_property_lookup(ExecutionContext *context, Value *result, uint index, CallData *callData);
+void __qmljs_call_element(ExecutionContext *context, Value *result, const Value &index, CallData *callData);
+void __qmljs_call_value(QV4::ExecutionContext *context, QV4::Value *result, const QV4::Value &func, CallData *callData);
 
-void __qmljs_construct_activation_property(QV4::ExecutionContext *, QV4::Value *result, QV4::String *name, QV4::Value *args, int argc);
-void __qmljs_construct_property(QV4::ExecutionContext *context, QV4::Value *result, const QV4::Value &base, QV4::String *name, QV4::Value *args, int argc);
-void __qmljs_construct_value(QV4::ExecutionContext *context, QV4::Value *result, const QV4::Value &func, QV4::Value *args, int argc);
+void __qmljs_construct_activation_property(QV4::ExecutionContext *, QV4::Value *result, QV4::String *name, CallData *callData);
+void __qmljs_construct_property(QV4::ExecutionContext *context, QV4::Value *result, const QV4::Value &base, QV4::String *name, CallData *callData);
+void __qmljs_construct_value(QV4::ExecutionContext *context, QV4::Value *result, const QV4::Value &func, CallData *callData);
 
 void __qmljs_builtin_typeof(QV4::ExecutionContext *ctx, QV4::Value *result, const QV4::Value &val);
 void __qmljs_builtin_typeof_name(QV4::ExecutionContext *context, QV4::Value* result, QV4::String *name);
@@ -145,8 +145,8 @@ void __qmljs_set_property(QV4::ExecutionContext *ctx, const QV4::Value &object,
 void __qmljs_get_property(QV4::ExecutionContext *ctx, QV4::Value *result, const QV4::Value &object, QV4::String *name);
 void __qmljs_get_activation_property(QV4::ExecutionContext *ctx, QV4::Value *result, QV4::String *name);
 
-void __qmljs_call_global_lookup(QV4::ExecutionContext *context, QV4::Value *result, uint index, QV4::Value *args, int argc);
-void __qmljs_construct_global_lookup(QV4::ExecutionContext *context, QV4::Value *result, uint index, QV4::Value *args, int argc);
+void __qmljs_call_global_lookup(QV4::ExecutionContext *context, QV4::Value *result, uint index, CallData *callData);
+void __qmljs_construct_global_lookup(QV4::ExecutionContext *context, QV4::Value *result, uint index, CallData *callData);
 
 
 void __qmljs_get_element(QV4::ExecutionContext *ctx, QV4::Value *retval, const QV4::Value &object, const QV4::Value &index);
diff --git a/src/qml/jsruntime/qv4scopedvalue_p.h b/src/qml/jsruntime/qv4scopedvalue_p.h
index 4218065768..5998fd92a1 100644
--- a/src/qml/jsruntime/qv4scopedvalue_p.h
+++ b/src/qml/jsruntime/qv4scopedvalue_p.h
@@ -140,11 +140,10 @@ struct ScopedCallData {
         : engine(e)
         // ### this check currently won't work because of exceptions
 #if 0 //ndef QT_NO_DEBUG
-        , size(qMax(argc, (int)QV4::Global::ReservedArgumentCount) + 2)
+        , size(qMax(argc, (int)QV4::Global::ReservedArgumentCount) + offsetof(QV4::CallData, args)/sizeof(QV4::Value))
 #endif
     {
-        Q_ASSERT(sizeof(CallData) == 3*sizeof(Value));
-        ptr = reinterpret_cast<CallData *>(e->stackPush(qMax(argc, (int)QV4::Global::ReservedArgumentCount) + 2));
+        ptr = reinterpret_cast<CallData *>(e->stackPush(qMax(argc, (int)QV4::Global::ReservedArgumentCount) + offsetof(QV4::CallData, args)/sizeof(QV4::Value)));
         ptr->tag = 0;
         ptr->argc = argc;
     }
diff --git a/src/qml/jsruntime/qv4sparsearray.cpp b/src/qml/jsruntime/qv4sparsearray.cpp
index 835a0d004f..5b720d2fef 100644
--- a/src/qml/jsruntime/qv4sparsearray.cpp
+++ b/src/qml/jsruntime/qv4sparsearray.cpp
@@ -43,6 +43,7 @@
 #include "qv4runtime_p.h"
 #include "qv4object_p.h"
 #include "qv4functionobject_p.h"
+#include "qv4scopedvalue_p.h"
 #include <stdlib.h>
 
 #ifdef QT_QMAP_DEBUG
@@ -54,20 +55,21 @@ using namespace QV4;
 
 bool ArrayElementLessThan::operator()(const Property &p1, const Property &p2) const
 {
-    Value v1 = p1.value;
-    Value v2 = p2.value;
 
-    if (v1.isUndefined())
+    if (p1.value.isUndefined())
         return false;
-    if (v2.isUndefined())
+    if (p2.value.isUndefined())
         return true;
-    if (!m_comparefn.isUndefined()) {
-        Value args[] = { v1, v2 };
+    if (Object *o = m_comparefn.asObject()) {
+        ScopedCallData callData(o->engine(), 2);
+        callData->thisObject = Value::undefinedValue();
+        callData->args[0] = p1.value;
+        callData->args[1] = p2.value;
         Value result = Value::undefinedValue();
-        __qmljs_call_value(m_context, &result, /*thisObject*/0, m_comparefn, args, 2);
+        __qmljs_call_value(m_context, &result, m_comparefn, callData.ptr);
         return result.toNumber() <= 0;
     }
-    return v1.toString(m_context)->toQString() < v2.toString(m_context)->toQString();
+    return p1.value.toString(m_context)->toQString() < p2.value.toString(m_context)->toQString();
 }
 
 
diff --git a/src/qml/jsruntime/qv4vme_moth.cpp b/src/qml/jsruntime/qv4vme_moth.cpp
index 10f09a8c82..5fef202cc6 100644
--- a/src/qml/jsruntime/qv4vme_moth.cpp
+++ b/src/qml/jsruntime/qv4vme_moth.cpp
@@ -45,7 +45,7 @@
 #include <private/qv4debugging_p.h>
 #include <private/qv4exception_p.h>
 #include <private/qv4math_p.h>
-
+#include <private/qv4scopedvalue_p.h>
 #include <iostream>
 
 #include "qv4alloca_p.h"
@@ -320,29 +320,41 @@ QV4::Value VME::run(QV4::ExecutionContext *context, const uchar *&code,
             }
         }
 #endif // DO_TRACE_INSTR
-        Q_ASSERT(instr.args + instr.argc <= stackSize);
-        QV4::Value *args = stack + instr.args;
-        __qmljs_call_value(context, VALUEPTR(instr.result), /*thisObject*/0, VALUE(instr.dest), args, instr.argc);
+        Q_ASSERT(instr.callData + instr.argc + offsetof(QV4::CallData, args)/sizeof(QV4::Value) <= stackSize);
+        QV4::CallData *callData = reinterpret_cast<QV4::CallData *>(stack + instr.callData);
+        callData->tag = 0;
+        callData->argc = instr.argc;
+        callData->thisObject = QV4::Value::undefinedValue();
+        __qmljs_call_value(context, VALUEPTR(instr.result), VALUE(instr.dest), callData);
     MOTH_END_INSTR(CallValue)
 
     MOTH_BEGIN_INSTR(CallProperty)
         TRACE(property name, "%s, args=%u, argc=%u, this=%s", qPrintable(instr.name->toQString()), instr.args, instr.argc, (VALUE(instr.base)).toString(context)->toQString().toUtf8().constData());
-        Q_ASSERT(instr.args + instr.argc <= stackSize);
-        QV4::Value *args = stack + instr.args;
-        __qmljs_call_property(context, VALUEPTR(instr.result), VALUE(instr.base), runtimeStrings[instr.name], args, instr.argc);
+        Q_ASSERT(instr.callData + instr.argc + offsetof(QV4::CallData, args)/sizeof(QV4::Value) <= stackSize);
+        QV4::CallData *callData = reinterpret_cast<QV4::CallData *>(stack + instr.callData);
+        callData->tag = 0;
+        callData->argc = instr.argc;
+        callData->thisObject = VALUE(instr.base);
+        __qmljs_call_property(context, VALUEPTR(instr.result), runtimeStrings[instr.name], callData);
     MOTH_END_INSTR(CallProperty)
 
     MOTH_BEGIN_INSTR(CallElement)
-        Q_ASSERT(instr.args + instr.argc <= stackSize);
-        QV4::Value *args = stack + instr.args;
-        __qmljs_call_element(context, VALUEPTR(instr.result), VALUE(instr.base), VALUE(instr.index), args, instr.argc);
+        Q_ASSERT(instr.callData + instr.argc + offsetof(QV4::CallData, args)/sizeof(QV4::Value) <= stackSize);
+        QV4::CallData *callData = reinterpret_cast<QV4::CallData *>(stack + instr.callData);
+        callData->tag = 0;
+        callData->argc = instr.argc;
+        callData->thisObject = VALUE(instr.base);
+        __qmljs_call_element(context, VALUEPTR(instr.result), VALUE(instr.index), callData);
     MOTH_END_INSTR(CallElement)
 
     MOTH_BEGIN_INSTR(CallActivationProperty)
-        Q_ASSERT(instr.args + instr.argc <= stackSize);
         TRACE(args, "starting at %d, length %d", instr.args, instr.argc);
-        QV4::Value *args = stack + instr.args;
-        __qmljs_call_activation_property(context, VALUEPTR(instr.result), runtimeStrings[instr.name], args, instr.argc);
+        Q_ASSERT(instr.callData + instr.argc + offsetof(QV4::CallData, args)/sizeof(QV4::Value) <= stackSize);
+        QV4::CallData *callData = reinterpret_cast<QV4::CallData *>(stack + instr.callData);
+        callData->tag = 0;
+        callData->argc = instr.argc;
+        callData->thisObject = QV4::Value::undefinedValue();
+        __qmljs_call_activation_property(context, VALUEPTR(instr.result), runtimeStrings[instr.name], callData);
     MOTH_END_INSTR(CallActivationProperty)
 
     MOTH_BEGIN_INSTR(CallBuiltinThrow)
@@ -485,22 +497,31 @@ QV4::Value VME::run(QV4::ExecutionContext *context, const uchar *&code,
     MOTH_END_INSTR(CallBuiltinSetupArgumentsObject)
 
     MOTH_BEGIN_INSTR(CreateValue)
-        Q_ASSERT(instr.args + instr.argc <= stackSize);
-        QV4::Value *args = stack + instr.args;
-        __qmljs_construct_value(context, VALUEPTR(instr.result), VALUE(instr.func), args, instr.argc);
+        Q_ASSERT(instr.callData + instr.argc + offsetof(QV4::CallData, args)/sizeof(QV4::Value) <= stackSize);
+        QV4::CallData *callData = reinterpret_cast<QV4::CallData *>(stack + instr.callData);
+        callData->tag = 0;
+        callData->argc = instr.argc;
+        callData->thisObject = QV4::Value::undefinedValue();
+        __qmljs_construct_value(context, VALUEPTR(instr.result), VALUE(instr.func), callData);
     MOTH_END_INSTR(CreateValue)
 
     MOTH_BEGIN_INSTR(CreateProperty)
-        Q_ASSERT(instr.args + instr.argc <= stackSize);
-        QV4::Value *args = stack + instr.args;
-        __qmljs_construct_property(context, VALUEPTR(instr.result), VALUE(instr.base), runtimeStrings[instr.name], args, instr.argc);
+        Q_ASSERT(instr.callData + instr.argc + offsetof(QV4::CallData, args)/sizeof(QV4::Value) <= stackSize);
+        QV4::CallData *callData = reinterpret_cast<QV4::CallData *>(stack + instr.callData);
+        callData->tag = 0;
+        callData->argc = instr.argc;
+        callData->thisObject = QV4::Value::undefinedValue();
+        __qmljs_construct_property(context, VALUEPTR(instr.result), VALUE(instr.base), runtimeStrings[instr.name], callData);
     MOTH_END_INSTR(CreateProperty)
 
     MOTH_BEGIN_INSTR(CreateActivationProperty)
         TRACE(inline, "property name = %s, args = %d, argc = %d", instr.name->toQString().toUtf8().constData(), instr.args, instr.argc);
-        Q_ASSERT(instr.args + instr.argc <= stackSize);
-        QV4::Value *args = stack + instr.args;
-        __qmljs_construct_activation_property(context, VALUEPTR(instr.result), runtimeStrings[instr.name], args, instr.argc);
+        Q_ASSERT(instr.callData + instr.argc + offsetof(QV4::CallData, args)/sizeof(QV4::Value) <= stackSize);
+        QV4::CallData *callData = reinterpret_cast<QV4::CallData *>(stack + instr.callData);
+        callData->tag = 0;
+        callData->argc = instr.argc;
+        callData->thisObject = QV4::Value::undefinedValue();
+        __qmljs_construct_activation_property(context, VALUEPTR(instr.result), runtimeStrings[instr.name], callData);
     MOTH_END_INSTR(CreateActivationProperty)
 
     MOTH_BEGIN_INSTR(Jump)