3 files changed, 13 insertions, 13 deletions
diff --git a/src/qml/jsruntime/qv4arrayobject.cpp b/src/qml/jsruntime/qv4arrayobject.cpp
index df9f117d04..03e5c29973 100644
--- a/src/qml/jsruntime/qv4arrayobject.cpp
+++ b/src/qml/jsruntime/qv4arrayobject.cpp
@@ -254,6 +254,7 @@ ReturnedValue ArrayPrototype::method_from(const FunctionObject *builtin, const V
             }
 
             if (mapfn) {
+                Q_ASSERT(mapArguments); // if mapfn is set, we always setup mapArguments with scope.alloc
                 mapArguments[0] = *nextValue;
                 mapArguments[1] = Value::fromDouble(k);
                 mappedValue = mapfn->call(thisArg, mapArguments, 2);
@@ -297,6 +298,7 @@ ReturnedValue ArrayPrototype::method_from(const FunctionObject *builtin, const V
             CHECK_EXCEPTION();
 
             if (mapfn) {
+                Q_ASSERT(mapArguments); // if mapfn is set, we always setup mapArguments with scope.alloc
                 mapArguments[0] = kValue;
                 mapArguments[1] = Value::fromDouble(k);
                 mappedValue = mapfn->call(thisArg, mapArguments, 2);
diff --git a/src/qml/jsruntime/qv4generatorobject.cpp b/src/qml/jsruntime/qv4generatorobject.cpp
index 4eee6f4338..5077bf1d2b 100644
--- a/src/qml/jsruntime/qv4generatorobject.cpp
+++ b/src/qml/jsruntime/qv4generatorobject.cpp
@@ -97,24 +97,21 @@ ReturnedValue GeneratorFunction::virtualCall(const FunctionObject *f, const Valu
     Function *function = gf->function();
     ExecutionEngine *engine = gf->engine();
 
-    // We need to set up a separate stack for the generator, as it's being re-entered
-    uint stackSize = argc // space for the original arguments
-                   + CppStackFrame::requiredJSStackFrameSize(function); // space for the JS stack frame
-
-    size_t requiredMemory = sizeof(GeneratorObject::Data) - sizeof(Value) + sizeof(Value) * stackSize;
-
     Scope scope(gf);
-    Scoped<GeneratorObject> g(scope, scope.engine->memoryManager->allocManaged<GeneratorObject>(requiredMemory, scope.engine->classes[EngineBase::Class_GeneratorObject]));
+    Scoped<GeneratorObject> g(scope, engine->memoryManager->allocManaged<GeneratorObject>(sizeof(GeneratorObject::Data), engine->classes[EngineBase::Class_GeneratorObject]));
     g->setPrototypeOf(ScopedObject(scope, gf->get(scope.engine->id_prototype())));
 
+    // We need to set up a separate JSFrame for the generator, as it's being re-entered
     Heap::GeneratorObject *gp = g->d();
-    gp->stack.size = stackSize;
-    gp->stack.alloc = stackSize;
+    gp->values.set(engine, engine->newArrayObject(argc));
+    gp->jsFrame.set(engine, engine->newArrayObject(CppStackFrame::requiredJSStackFrameSize(function)));
 
     // copy original arguments
-    memcpy(gp->stack.values, argv, argc*sizeof(Value));
-    gp->cppFrame.init(engine, function, gp->stack.values, argc);
-    gp->cppFrame.setupJSFrame(&gp->stack.values[argc], *gf, gf->scope(),
+    for (int i = 0; i < argc; i++)
+        gp->values->arrayData->setArrayData(engine, i, argv[i]);
+
+    gp->cppFrame.init(engine, function, gp->values->arrayData->values.values, argc);
+    gp->cppFrame.setupJSFrame(gp->jsFrame->arrayData->values.values, *gf, gf->scope(),
                               thisObject ? *thisObject : Value::undefinedValue(),
                               Value::undefinedValue());
 
diff --git a/src/qml/jsruntime/qv4generatorobject_p.h b/src/qml/jsruntime/qv4generatorobject_p.h
index 366319723d..10eea5e46b 100644
--- a/src/qml/jsruntime/qv4generatorobject_p.h
+++ b/src/qml/jsruntime/qv4generatorobject_p.h
@@ -90,7 +90,8 @@ struct GeneratorPrototype : FunctionObject {
     Member(class, Pointer, GeneratorFunction *, function) \
     Member(class, NoMark, GeneratorState, state) \
     Member(class, NoMark, CppStackFrame, cppFrame) \
-    Member(class, ValueArray, ValueArray, stack)
+    Member(class, Pointer, ArrayObject *, values) \
+    Member(class, Pointer, ArrayObject *, jsFrame)
 
 DECLARE_HEAP_OBJECT(GeneratorObject, Object) {
     DECLARE_MARKOBJECTS(GeneratorObject);