Move constructor objects onto the js stack

Change-Id: I828c5f7407d90cd5df1a8fd89a0ca35074fbde43
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

8 files changed, 120 insertions, 120 deletions

diff --git a/src/qml/jsruntime/qv4arraybuffer.cpp b/src/qml/jsruntime/qv4arraybuffer.cpp
index 021f070516..975f0121b9 100644
--- a/src/qml/jsruntime/qv4arraybuffer.cpp
+++ b/src/qml/jsruntime/qv4arraybuffer.cpp
@@ -84,7 +84,7 @@ ReturnedValue ArrayBufferCtor::method_isView(CallContext *ctx)
 
 
 Heap::ArrayBuffer::ArrayBuffer(ExecutionEngine *e, size_t length)
-    : Heap::Object(e->emptyClass, e->arrayBufferPrototype.objectValue())
+    : Heap::Object(e->emptyClass, e->arrayBufferPrototype())
 {
     data = QTypedArrayData<char>::allocate(length + 1);
     if (!data) {
@@ -97,7 +97,7 @@ Heap::ArrayBuffer::ArrayBuffer(ExecutionEngine *e, size_t length)
 }
 
 Heap::ArrayBuffer::ArrayBuffer(ExecutionEngine *e, const QByteArray& array)
-    : Heap::Object(e->emptyClass, e->arrayBufferPrototype.as<QV4::Object>())
+    : Heap::Object(e->emptyClass, e->arrayBufferPrototype())
     , data(const_cast<QByteArray&>(array).data_ptr())
 {
     data->ref.ref();
diff --git a/src/qml/jsruntime/qv4dataview.cpp b/src/qml/jsruntime/qv4dataview.cpp
index a7c0df1432..7d1a13c8fe 100644
--- a/src/qml/jsruntime/qv4dataview.cpp
+++ b/src/qml/jsruntime/qv4dataview.cpp
@@ -77,7 +77,7 @@ ReturnedValue DataViewCtor::call(const Managed *that, CallData *callData)
 
 
 Heap::DataView::DataView(ExecutionEngine *e)
-    : Heap::Object(e->emptyClass, e->dataViewPrototype.objectValue()),
+    : Heap::Object(e->emptyClass, e->dataViewPrototype()),
       buffer(0),
       byteLength(0),
       byteOffset(0)
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index 388cb86688..a2edcbca16 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -229,6 +229,8 @@ ExecutionEngine::ExecutionEngine(EvalISelFactory *factory)
     exceptionValue = jsAlloca(1);
     globalObject = static_cast<Object *>(jsAlloca(1));
     jsObjects = jsAlloca(NJSObjects);
+    typedArrayPrototype = static_cast<Object *>(jsAlloca(NTypedArrayTypes));
+    typedArrayCtors = static_cast<FunctionObject *>(jsAlloca(NTypedArrayTypes));
 
 #ifdef V4_USE_VALGRIND
     VALGRIND_MAKE_MEM_UNDEFINED(jsStackBase, 2*JSStackLimit);
@@ -336,37 +338,37 @@ ExecutionEngine::ExecutionEngine(EvalISelFactory *factory)
     jsObjects[SequenceProto] = ScopedValue(scope, memoryManager->alloc<SequencePrototype>(arrayClass, arrayPrototype()));
 
     ScopedContext global(scope, rootContext());
-    objectCtor = memoryManager->alloc<ObjectCtor>(global);
-    stringCtor = memoryManager->alloc<StringCtor>(global);
-    numberCtor = memoryManager->alloc<NumberCtor>(global);
-    booleanCtor = memoryManager->alloc<BooleanCtor>(global);
-    arrayCtor = memoryManager->alloc<ArrayCtor>(global);
-    functionCtor = memoryManager->alloc<FunctionCtor>(global);
-    dateCtor = memoryManager->alloc<DateCtor>(global);
-    regExpCtor = memoryManager->alloc<RegExpCtor>(global);
-    errorCtor = memoryManager->alloc<ErrorCtor>(global);
-    evalErrorCtor = memoryManager->alloc<EvalErrorCtor>(global);
-    rangeErrorCtor = memoryManager->alloc<RangeErrorCtor>(global);
-    referenceErrorCtor = memoryManager->alloc<ReferenceErrorCtor>(global);
-    syntaxErrorCtor = memoryManager->alloc<SyntaxErrorCtor>(global);
-    typeErrorCtor = memoryManager->alloc<TypeErrorCtor>(global);
-    uRIErrorCtor = memoryManager->alloc<URIErrorCtor>(global);
-
-    static_cast<ObjectPrototype *>(objectPrototype())->init(this, objectCtor.as<Object>());
-    static_cast<StringPrototype *>(stringPrototype())->init(this, stringCtor.as<Object>());
-    static_cast<NumberPrototype *>(numberPrototype())->init(this, numberCtor.as<Object>());
-    static_cast<BooleanPrototype *>(booleanPrototype())->init(this, booleanCtor.as<Object>());
-    static_cast<ArrayPrototype *>(arrayPrototype())->init(this, arrayCtor.as<Object>());
-    static_cast<DatePrototype *>(datePrototype())->init(this, dateCtor.as<Object>());
-    static_cast<FunctionPrototype *>(functionPrototype())->init(this, functionCtor.as<Object>());
-    static_cast<RegExpPrototype *>(regExpPrototype())->init(this, regExpCtor.as<Object>());
-    static_cast<ErrorPrototype *>(errorPrototype())->init(this, errorCtor.as<Object>());
-    static_cast<EvalErrorPrototype *>(evalErrorPrototype())->init(this, evalErrorCtor.as<Object>());
-    static_cast<RangeErrorPrototype *>(rangeErrorPrototype())->init(this, rangeErrorCtor.as<Object>());
-    static_cast<ReferenceErrorPrototype *>(referenceErrorPrototype())->init(this, referenceErrorCtor.as<Object>());
-    static_cast<SyntaxErrorPrototype *>(syntaxErrorPrototype())->init(this, syntaxErrorCtor.as<Object>());
-    static_cast<TypeErrorPrototype *>(typeErrorPrototype())->init(this, typeErrorCtor.as<Object>());
-    static_cast<URIErrorPrototype *>(uRIErrorPrototype())->init(this, uRIErrorCtor.as<Object>());
+    jsObjects[Object_Ctor] = memoryManager->alloc<ObjectCtor>(global);
+    jsObjects[String_Ctor] = memoryManager->alloc<StringCtor>(global);
+    jsObjects[Number_Ctor] = memoryManager->alloc<NumberCtor>(global);
+    jsObjects[Boolean_Ctor] = memoryManager->alloc<BooleanCtor>(global);
+    jsObjects[Array_Ctor] = memoryManager->alloc<ArrayCtor>(global);
+    jsObjects[Function_Ctor] = memoryManager->alloc<FunctionCtor>(global);
+    jsObjects[Date_Ctor] = memoryManager->alloc<DateCtor>(global);
+    jsObjects[RegExp_Ctor] = memoryManager->alloc<RegExpCtor>(global);
+    jsObjects[Error_Ctor] = memoryManager->alloc<ErrorCtor>(global);
+    jsObjects[EvalError_Ctor] = memoryManager->alloc<EvalErrorCtor>(global);
+    jsObjects[RangeError_Ctor] = memoryManager->alloc<RangeErrorCtor>(global);
+    jsObjects[ReferenceError_Ctor] = memoryManager->alloc<ReferenceErrorCtor>(global);
+    jsObjects[SyntaxError_Ctor] = memoryManager->alloc<SyntaxErrorCtor>(global);
+    jsObjects[TypeError_Ctor] = memoryManager->alloc<TypeErrorCtor>(global);
+    jsObjects[URIError_Ctor] = memoryManager->alloc<URIErrorCtor>(global);
+
+    static_cast<ObjectPrototype *>(objectPrototype())->init(this, objectCtor());
+    static_cast<StringPrototype *>(stringPrototype())->init(this, stringCtor());
+    static_cast<NumberPrototype *>(numberPrototype())->init(this, numberCtor());
+    static_cast<BooleanPrototype *>(booleanPrototype())->init(this, booleanCtor());
+    static_cast<ArrayPrototype *>(arrayPrototype())->init(this, arrayCtor());
+    static_cast<DatePrototype *>(datePrototype())->init(this, dateCtor());
+    static_cast<FunctionPrototype *>(functionPrototype())->init(this, functionCtor());
+    static_cast<RegExpPrototype *>(regExpPrototype())->init(this, regExpCtor());
+    static_cast<ErrorPrototype *>(errorPrototype())->init(this, errorCtor());
+    static_cast<EvalErrorPrototype *>(evalErrorPrototype())->init(this, evalErrorCtor());
+    static_cast<RangeErrorPrototype *>(rangeErrorPrototype())->init(this, rangeErrorCtor());
+    static_cast<ReferenceErrorPrototype *>(referenceErrorPrototype())->init(this, referenceErrorCtor());
+    static_cast<SyntaxErrorPrototype *>(syntaxErrorPrototype())->init(this, syntaxErrorCtor());
+    static_cast<TypeErrorPrototype *>(typeErrorPrototype())->init(this, typeErrorCtor());
+    static_cast<URIErrorPrototype *>(uRIErrorPrototype())->init(this, uRIErrorCtor());
 
     static_cast<VariantPrototype *>(variantPrototype())->init();
     sequencePrototype()->cast<SequencePrototype>()->init();
@@ -374,17 +376,17 @@ ExecutionEngine::ExecutionEngine(EvalISelFactory *factory)
 
     // typed arrays
 
-    arrayBufferCtor = memoryManager->alloc<ArrayBufferCtor>(global);
-    arrayBufferPrototype = memoryManager->alloc<ArrayBufferPrototype>(emptyClass, objectPrototype());
-    static_cast<ArrayBufferPrototype *>(arrayBufferPrototype.as<Object>())->init(this, arrayBufferCtor.as<Object>());
+    jsObjects[ArrayBuffer_Ctor] = memoryManager->alloc<ArrayBufferCtor>(global);
+    jsObjects[ArrayBufferProto] = memoryManager->alloc<ArrayBufferPrototype>(emptyClass, objectPrototype());
+    static_cast<ArrayBufferPrototype *>(arrayBufferPrototype())->init(this, arrayBufferCtor());
 
-    dataViewCtor = memoryManager->alloc<DataViewCtor>(global);
-    dataViewPrototype = memoryManager->alloc<DataViewPrototype>(emptyClass, objectPrototype());
-    static_cast<DataViewPrototype *>(dataViewPrototype.as<Object>())->init(this, dataViewCtor.as<Object>());
+    jsObjects[DataView_Ctor] = memoryManager->alloc<DataViewCtor>(global);
+    jsObjects[DataViewProto] = memoryManager->alloc<DataViewPrototype>(emptyClass, objectPrototype());
+    static_cast<DataViewPrototype *>(dataViewPrototype())->init(this, dataViewCtor());
 
     for (int i = 0; i < Heap::TypedArray::NTypes; ++i) {
-        typedArrayCtors[i] = memoryManager->alloc<TypedArrayCtor>(global, Heap::TypedArray::Type(i));
-        typedArrayPrototype[i] = memoryManager->alloc<TypedArrayPrototype>(this, Heap::TypedArray::Type(i));
+        static_cast<Value &>(typedArrayCtors[i]) = memoryManager->alloc<TypedArrayCtor>(global, Heap::TypedArray::Type(i));
+        static_cast<Value &>(typedArrayPrototype[i]) = memoryManager->alloc<TypedArrayPrototype>(this, Heap::TypedArray::Type(i));
         typedArrayPrototype[i].as<TypedArrayPrototype>()->init(this, static_cast<TypedArrayCtor *>(typedArrayCtors[i].as<Object>()));
     }
 
@@ -395,24 +397,24 @@ ExecutionEngine::ExecutionEngine(EvalISelFactory *factory)
     rootContext()->callData->thisObject = globalObject;
     Q_ASSERT(globalObject->d()->vtable);
 
-    globalObject->defineDefaultProperty(QStringLiteral("Object"), objectCtor);
-    globalObject->defineDefaultProperty(QStringLiteral("String"), stringCtor);
-    globalObject->defineDefaultProperty(QStringLiteral("Number"), numberCtor);
-    globalObject->defineDefaultProperty(QStringLiteral("Boolean"), booleanCtor);
-    globalObject->defineDefaultProperty(QStringLiteral("Array"), arrayCtor);
-    globalObject->defineDefaultProperty(QStringLiteral("Function"), functionCtor);
-    globalObject->defineDefaultProperty(QStringLiteral("Date"), dateCtor);
-    globalObject->defineDefaultProperty(QStringLiteral("RegExp"), regExpCtor);
-    globalObject->defineDefaultProperty(QStringLiteral("Error"), errorCtor);
-    globalObject->defineDefaultProperty(QStringLiteral("EvalError"), evalErrorCtor);
-    globalObject->defineDefaultProperty(QStringLiteral("RangeError"), rangeErrorCtor);
-    globalObject->defineDefaultProperty(QStringLiteral("ReferenceError"), referenceErrorCtor);
-    globalObject->defineDefaultProperty(QStringLiteral("SyntaxError"), syntaxErrorCtor);
-    globalObject->defineDefaultProperty(QStringLiteral("TypeError"), typeErrorCtor);
-    globalObject->defineDefaultProperty(QStringLiteral("URIError"), uRIErrorCtor);
-
-    globalObject->defineDefaultProperty(QStringLiteral("ArrayBuffer"), arrayBufferCtor);
-    globalObject->defineDefaultProperty(QStringLiteral("DataView"), dataViewCtor);
+    globalObject->defineDefaultProperty(QStringLiteral("Object"), *objectCtor());
+    globalObject->defineDefaultProperty(QStringLiteral("String"), *stringCtor());
+    globalObject->defineDefaultProperty(QStringLiteral("Number"), *numberCtor());
+    globalObject->defineDefaultProperty(QStringLiteral("Boolean"), *booleanCtor());
+    globalObject->defineDefaultProperty(QStringLiteral("Array"), *arrayCtor());
+    globalObject->defineDefaultProperty(QStringLiteral("Function"), *functionCtor());
+    globalObject->defineDefaultProperty(QStringLiteral("Date"), *dateCtor());
+    globalObject->defineDefaultProperty(QStringLiteral("RegExp"), *regExpCtor());
+    globalObject->defineDefaultProperty(QStringLiteral("Error"), *errorCtor());
+    globalObject->defineDefaultProperty(QStringLiteral("EvalError"), *evalErrorCtor());
+    globalObject->defineDefaultProperty(QStringLiteral("RangeError"), *rangeErrorCtor());
+    globalObject->defineDefaultProperty(QStringLiteral("ReferenceError"), *referenceErrorCtor());
+    globalObject->defineDefaultProperty(QStringLiteral("SyntaxError"), *syntaxErrorCtor());
+    globalObject->defineDefaultProperty(QStringLiteral("TypeError"), *typeErrorCtor());
+    globalObject->defineDefaultProperty(QStringLiteral("URIError"), *uRIErrorCtor());
+
+    globalObject->defineDefaultProperty(QStringLiteral("ArrayBuffer"), *arrayBufferCtor());
+    globalObject->defineDefaultProperty(QStringLiteral("DataView"), *dataViewCtor());
     ScopedString str(scope);
     for (int i = 0; i < Heap::TypedArray::NTypes; ++i)
         globalObject->defineDefaultProperty((str = typedArrayCtors[i].as<FunctionObject>()->name())->toQString(), typedArrayCtors[i]);
@@ -932,31 +934,9 @@ void ExecutionEngine::markObjects()
     id_buffer->mark(this);
     id_lastIndex->mark(this);
 
-    objectCtor.mark(this);
-    stringCtor.mark(this);
-    numberCtor.mark(this);
-    booleanCtor.mark(this);
-    arrayCtor.mark(this);
-    functionCtor.mark(this);
-    dateCtor.mark(this);
-    regExpCtor.mark(this);
-    errorCtor.mark(this);
-    evalErrorCtor.mark(this);
-    rangeErrorCtor.mark(this);
-    referenceErrorCtor.mark(this);
-    syntaxErrorCtor.mark(this);
-    typeErrorCtor.mark(this);
-    uRIErrorCtor.mark(this);
-    arrayBufferCtor.mark(this);
-    dataViewCtor.mark(this);
     for (int i = 0; i < Heap::TypedArray::NTypes; ++i)
         typedArrayCtors[i].mark(this);
 
-    arrayBufferPrototype.mark(this);
-    dataViewPrototype.mark(this);
-    for (int i = 0; i < Heap::TypedArray::NTypes; ++i)
-        typedArrayPrototype[i].mark(this);
-
     thrower->mark(this);
 
     if (m_qmlExtensions)
diff --git a/src/qml/jsruntime/qv4engine_p.h b/src/qml/jsruntime/qv4engine_p.h
index f3c20d6336..e983e96580 100644
--- a/src/qml/jsruntime/qv4engine_p.h
+++ b/src/qml/jsruntime/qv4engine_p.h
@@ -146,29 +146,49 @@ public:
         URIErrorProto,
         VariantProto,
         SequenceProto,
+        ArrayBufferProto,
+        DataViewProto,
+
+        Object_Ctor,
+        String_Ctor,
+        Number_Ctor,
+        Boolean_Ctor,
+        Array_Ctor,
+        Function_Ctor,
+        Date_Ctor,
+        RegExp_Ctor,
+        Error_Ctor,
+        EvalError_Ctor,
+        RangeError_Ctor,
+        ReferenceError_Ctor,
+        SyntaxError_Ctor,
+        TypeError_Ctor,
+        URIError_Ctor,
+        ArrayBuffer_Ctor,
+        DataView_Ctor,
         NJSObjects
     };
     Value *jsObjects;
-
-    Value objectCtor;
-    Value stringCtor;
-    Value numberCtor;
-    Value booleanCtor;
-    Value arrayCtor;
-    Value functionCtor;
-    Value dateCtor;
-    Value regExpCtor;
-    Value errorCtor;
-    Value evalErrorCtor;
-    Value rangeErrorCtor;
-    Value referenceErrorCtor;
-    Value syntaxErrorCtor;
-    Value typeErrorCtor;
-    Value uRIErrorCtor;
-    Value arrayBufferCtor;
-    Value dataViewCtor;
-    enum { NTypedArrayTypes = 9 }; // avoid header dependency
-    Value typedArrayCtors[NTypedArrayTypes];
+    enum { NTypedArrayTypes = 9 }; // == TypedArray::NValues, avoid header dependency
+
+    FunctionObject *objectCtor() const { return reinterpret_cast<FunctionObject *>(jsObjects + Object_Ctor); }
+    FunctionObject *stringCtor() const { return reinterpret_cast<FunctionObject *>(jsObjects + String_Ctor); }
+    FunctionObject *numberCtor() const { return reinterpret_cast<FunctionObject *>(jsObjects + Number_Ctor); }
+    FunctionObject *booleanCtor() const { return reinterpret_cast<FunctionObject *>(jsObjects + Boolean_Ctor); }
+    FunctionObject *arrayCtor() const { return reinterpret_cast<FunctionObject *>(jsObjects + Array_Ctor); }
+    FunctionObject *functionCtor() const { return reinterpret_cast<FunctionObject *>(jsObjects + Function_Ctor); }
+    FunctionObject *dateCtor() const { return reinterpret_cast<FunctionObject *>(jsObjects + Date_Ctor); }
+    FunctionObject *regExpCtor() const { return reinterpret_cast<FunctionObject *>(jsObjects + RegExp_Ctor); }
+    FunctionObject *errorCtor() const { return reinterpret_cast<FunctionObject *>(jsObjects + Error_Ctor); }
+    FunctionObject *evalErrorCtor() const { return reinterpret_cast<FunctionObject *>(jsObjects + EvalError_Ctor); }
+    FunctionObject *rangeErrorCtor() const { return reinterpret_cast<FunctionObject *>(jsObjects + RangeError_Ctor); }
+    FunctionObject *referenceErrorCtor() const { return reinterpret_cast<FunctionObject *>(jsObjects + ReferenceError_Ctor); }
+    FunctionObject *syntaxErrorCtor() const { return reinterpret_cast<FunctionObject *>(jsObjects + SyntaxError_Ctor); }
+    FunctionObject *typeErrorCtor() const { return reinterpret_cast<FunctionObject *>(jsObjects + TypeError_Ctor); }
+    FunctionObject *uRIErrorCtor() const { return reinterpret_cast<FunctionObject *>(jsObjects + URIError_Ctor); }
+    FunctionObject *arrayBufferCtor() const { return reinterpret_cast<FunctionObject *>(jsObjects + ArrayBuffer_Ctor); }
+    FunctionObject *dataViewCtor() const { return reinterpret_cast<FunctionObject *>(jsObjects + DataView_Ctor); }
+    FunctionObject *typedArrayCtors;
 
     Object *objectPrototype() const { return reinterpret_cast<Object *>(jsObjects + ObjectProto); }
     Object *arrayPrototype() const { return reinterpret_cast<Object *>(jsObjects + ArrayProto); }
@@ -188,9 +208,9 @@ public:
     Object *variantPrototype() const { return reinterpret_cast<Object *>(jsObjects + VariantProto); }
     Object *sequencePrototype() const { return reinterpret_cast<Object *>(jsObjects + SequenceProto); }
 
-    Value arrayBufferPrototype;
-    Value dataViewPrototype;
-    Value typedArrayPrototype[NTypedArrayTypes]; // TypedArray::NValues, avoid including the header here
+    Object *arrayBufferPrototype() const { return reinterpret_cast<Object *>(jsObjects + ArrayBufferProto); }
+    Object *dataViewPrototype() const { return reinterpret_cast<Object *>(jsObjects + DataViewProto); }
+    Object *typedArrayPrototype;
 
     InternalClassPool *classPool;
     InternalClass *emptyClass;
diff --git a/src/qml/jsruntime/qv4regexpobject.cpp b/src/qml/jsruntime/qv4regexpobject.cpp
index 077ac991a9..3274e030c4 100644
--- a/src/qml/jsruntime/qv4regexpobject.cpp
+++ b/src/qml/jsruntime/qv4regexpobject.cpp
@@ -363,7 +363,7 @@ ReturnedValue RegExpPrototype::method_exec(CallContext *ctx)
     uint* matchOffsets = (uint*)alloca(r->value()->captureCount() * 2 * sizeof(uint));
     const int result = Scoped<RegExp>(scope, r->value())->match(s, offset, matchOffsets);
 
-    Scoped<RegExpCtor> regExpCtor(scope, ctx->d()->engine->regExpCtor);
+    Scoped<RegExpCtor> regExpCtor(scope, ctx->d()->engine->regExpCtor());
     regExpCtor->d()->clearLastMatch();
 
     if (result == -1) {
@@ -425,7 +425,7 @@ ReturnedValue RegExpPrototype::method_compile(CallContext *ctx)
     ScopedCallData callData(scope, ctx->argc());
     memcpy(callData->args, ctx->args(), ctx->argc()*sizeof(Value));
 
-    Scoped<RegExpObject> re(scope, ctx->d()->engine->regExpCtor.as<FunctionObject>()->construct(callData));
+    Scoped<RegExpObject> re(scope, ctx->d()->engine->regExpCtor()->as<FunctionObject>()->construct(callData));
 
     r->d()->value = re->value();
     r->d()->global = re->global();
@@ -436,7 +436,7 @@ template <int index>
 ReturnedValue RegExpPrototype::method_get_lastMatch_n(CallContext *ctx)
 {
     Scope scope(ctx);
-    ScopedArrayObject lastMatch(scope, static_cast<RegExpCtor*>(ctx->d()->engine->regExpCtor.objectValue())->lastMatch());
+    ScopedArrayObject lastMatch(scope, static_cast<RegExpCtor*>(ctx->d()->engine->regExpCtor())->lastMatch());
     ScopedValue result(scope, lastMatch ? lastMatch->getIndexed(index) : Encode::undefined());
     if (result->isUndefined())
         return ctx->d()->engine->newString()->asReturnedValue();
@@ -446,7 +446,7 @@ ReturnedValue RegExpPrototype::method_get_lastMatch_n(CallContext *ctx)
 ReturnedValue RegExpPrototype::method_get_lastParen(CallContext *ctx)
 {
     Scope scope(ctx);
-    ScopedArrayObject lastMatch(scope, static_cast<RegExpCtor*>(ctx->d()->engine->regExpCtor.objectValue())->lastMatch());
+    ScopedArrayObject lastMatch(scope, static_cast<RegExpCtor*>(ctx->d()->engine->regExpCtor())->lastMatch());
     ScopedValue result(scope, lastMatch ? lastMatch->getIndexed(lastMatch->getLength() - 1) : Encode::undefined());
     if (result->isUndefined())
         return ctx->d()->engine->newString()->asReturnedValue();
@@ -455,13 +455,13 @@ ReturnedValue RegExpPrototype::method_get_lastParen(CallContext *ctx)
 
 ReturnedValue RegExpPrototype::method_get_input(CallContext *ctx)
 {
-    return static_cast<RegExpCtor*>(ctx->d()->engine->regExpCtor.objectValue())->lastInput()->asReturnedValue();
+    return static_cast<RegExpCtor*>(ctx->d()->engine->regExpCtor())->lastInput()->asReturnedValue();
 }
 
 ReturnedValue RegExpPrototype::method_get_leftContext(CallContext *ctx)
 {
     Scope scope(ctx);
-    Scoped<RegExpCtor> regExpCtor(scope, ctx->d()->engine->regExpCtor);
+    Scoped<RegExpCtor> regExpCtor(scope, ctx->d()->engine->regExpCtor());
     QString lastInput = regExpCtor->lastInput()->toQString();
     return ctx->d()->engine->newString(lastInput.left(regExpCtor->lastMatchStart()))->asReturnedValue();
 }
@@ -469,7 +469,7 @@ ReturnedValue RegExpPrototype::method_get_leftContext(CallContext *ctx)
 ReturnedValue RegExpPrototype::method_get_rightContext(CallContext *ctx)
 {
     Scope scope(ctx);
-    Scoped<RegExpCtor> regExpCtor(scope, ctx->d()->engine->regExpCtor);
+    Scoped<RegExpCtor> regExpCtor(scope, ctx->d()->engine->regExpCtor());
     QString lastInput = regExpCtor->lastInput()->toQString();
     return ctx->d()->engine->newString(lastInput.mid(regExpCtor->lastMatchEnd()))->asReturnedValue();
 }
diff --git a/src/qml/jsruntime/qv4stringobject.cpp b/src/qml/jsruntime/qv4stringobject.cpp
index e46bbfe7d6..bbdc96f0f1 100644
--- a/src/qml/jsruntime/qv4stringobject.cpp
+++ b/src/qml/jsruntime/qv4stringobject.cpp
@@ -368,7 +368,7 @@ ReturnedValue StringPrototype::method_match(CallContext *context)
     if (!rx) {
         ScopedCallData callData(scope, 1);
         callData->args[0] = regexp;
-        rx = context->d()->engine->regExpCtor.as<FunctionObject>()->construct(callData);
+        rx = context->d()->engine->regExpCtor()->construct(callData);
     }
 
     if (!rx)
@@ -593,7 +593,7 @@ ReturnedValue StringPrototype::method_search(CallContext *ctx)
     if (!regExp) {
         ScopedCallData callData(scope, 1);
         callData->args[0] = regExpValue;
-        regExpValue = ctx->d()->engine->regExpCtor.as<FunctionObject>()->construct(callData);
+        regExpValue = ctx->d()->engine->regExpCtor()->construct(callData);
         if (scope.engine->hasException)
             return Encode::undefined();
         regExp = regExpValue->as<RegExpObject>();
diff --git a/src/qml/jsruntime/qv4typedarray.cpp b/src/qml/jsruntime/qv4typedarray.cpp
index 6230568294..d93b57e472 100644
--- a/src/qml/jsruntime/qv4typedarray.cpp
+++ b/src/qml/jsruntime/qv4typedarray.cpp
@@ -336,7 +336,7 @@ ReturnedValue TypedArrayCtor::call(const Managed *that, CallData *callData)
 }
 
 Heap::TypedArray::TypedArray(ExecutionEngine *e, Type t)
-    : Heap::Object(e->emptyClass, e->typedArrayPrototype[t].objectValue()),
+    : Heap::Object(e->emptyClass, e->typedArrayPrototype + t),
       type(operations + t),
       arrayType(t)
 {
diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp
index f5407d5669..7f49798da6 100644
--- a/src/qml/qml/qqmllocale.cpp
+++ b/src/qml/qml/qqmllocale.cpp
@@ -68,10 +68,10 @@ void QQmlDateExtension::registerExtension(QV4::ExecutionEngine *engine)
     engine->datePrototype()->defineDefaultProperty(QStringLiteral("toLocaleString"), method_toLocaleString);
     engine->datePrototype()->defineDefaultProperty(QStringLiteral("toLocaleTimeString"), method_toLocaleTimeString);
     engine->datePrototype()->defineDefaultProperty(QStringLiteral("toLocaleDateString"), method_toLocaleDateString);
-    engine->dateCtor.objectValue()->defineDefaultProperty(QStringLiteral("fromLocaleString"), method_fromLocaleString);
-    engine->dateCtor.objectValue()->defineDefaultProperty(QStringLiteral("fromLocaleTimeString"), method_fromLocaleTimeString);
-    engine->dateCtor.objectValue()->defineDefaultProperty(QStringLiteral("fromLocaleDateString"), method_fromLocaleDateString);
-    engine->dateCtor.objectValue()->defineDefaultProperty(QStringLiteral("timeZoneUpdated"), method_timeZoneUpdated);
+    engine->dateCtor()->defineDefaultProperty(QStringLiteral("fromLocaleString"), method_fromLocaleString);
+    engine->dateCtor()->defineDefaultProperty(QStringLiteral("fromLocaleTimeString"), method_fromLocaleTimeString);
+    engine->dateCtor()->defineDefaultProperty(QStringLiteral("fromLocaleDateString"), method_fromLocaleDateString);
+    engine->dateCtor()->defineDefaultProperty(QStringLiteral("timeZoneUpdated"), method_timeZoneUpdated);
 }
 
 QV4::ReturnedValue QQmlDateExtension::method_toLocaleString(QV4::CallContext *ctx)
@@ -349,7 +349,7 @@ void QQmlNumberExtension::registerExtension(QV4::ExecutionEngine *engine)
 {
     engine->numberPrototype()->defineDefaultProperty(QStringLiteral("toLocaleString"), method_toLocaleString);
     engine->numberPrototype()->defineDefaultProperty(QStringLiteral("toLocaleCurrencyString"), method_toLocaleCurrencyString);
-    engine->numberCtor.objectValue()->defineDefaultProperty(QStringLiteral("fromLocaleString"), method_fromLocaleString);
+    engine->numberCtor()->defineDefaultProperty(QStringLiteral("fromLocaleString"), method_fromLocaleString);
 }
 
 QV4::ReturnedValue QQmlNumberExtension::method_toLocaleString(QV4::CallContext *ctx)