1 files changed, 12 insertions, 10 deletions
diff --git a/src/qml/jsruntime/qv4functionobject.cpp b/src/qml/jsruntime/qv4functionobject.cpp
index 64f7b98618..1ac0e28a1b 100644
--- a/src/qml/jsruntime/qv4functionobject.cpp
+++ b/src/qml/jsruntime/qv4functionobject.cpp
@@ -484,13 +484,14 @@ void BuiltinFunction::call(const Managed *that, Scope &scope, CallData *callData
 
     ExecutionContextSaver ctxSaver(scope);
 
-    CallContext::Data ctx = CallContext::Data::createOnStack(v4);
-    ctx.strictMode = f->scope()->strictMode; // ### needed? scope or parent context?
-    ctx.callData = callData;
-    v4->pushContext(&ctx);
-    Q_ASSERT(v4->current == &ctx);
+    CallContext::Data *ctx = CallContext::Data::createSimpleContext(v4);
+    ctx->strictMode = f->scope()->strictMode; // ### needed? scope or parent context?
+    ctx->callData = callData;
+    v4->pushContext(ctx);
+    Q_ASSERT(v4->current == ctx);
 
     scope.result = f->d()->code(static_cast<QV4::CallContext *>(v4->currentContext));
+    ctx->freeSimpleCallContext();
 }
 
 void IndexedBuiltinFunction::call(const Managed *that, Scope &scope, CallData *callData)
@@ -505,13 +506,14 @@ void IndexedBuiltinFunction::call(const Managed *that, Scope &scope, CallData *c
 
     ExecutionContextSaver ctxSaver(scope);
 
-    CallContext::Data ctx = CallContext::Data::createOnStack(v4);
-    ctx.strictMode = f->scope()->strictMode; // ### needed? scope or parent context?
-    ctx.callData = callData;
-    v4->pushContext(&ctx);
-    Q_ASSERT(v4->current == &ctx);
+    CallContext::Data *ctx = CallContext::Data::createSimpleContext(v4);
+    ctx->strictMode = f->scope()->strictMode; // ### needed? scope or parent context?
+    ctx->callData = callData;
+    v4->pushContext(ctx);
+    Q_ASSERT(v4->current == ctx);
 
     scope.result = f->d()->code(static_cast<QV4::CallContext *>(v4->currentContext), f->d()->index);
+    ctx->freeSimpleCallContext();
 }
 
 DEFINE_OBJECT_VTABLE(IndexedBuiltinFunction);