1 files changed, 11 insertions, 12 deletions
diff --git a/src/qml/jsruntime/qv4functionobject.cpp b/src/qml/jsruntime/qv4functionobject.cpp
index dc8ee550d5..73a8eb1193 100644
--- a/src/qml/jsruntime/qv4functionobject.cpp
+++ b/src/qml/jsruntime/qv4functionobject.cpp
@@ -146,8 +146,8 @@ void FunctionObject::init(String *n, bool createProto)
 
     Q_ASSERT(internalClass() && internalClass()->find(s.engine->id_prototype()) == Heap::FunctionObject::Index_Prototype);
     if (createProto) {
-        ScopedObject proto(s, s.engine->newObject(s.engine->internalClasses[EngineBase::Class_ObjectProto], s.engine->objectPrototype()));
-        Q_ASSERT(s.engine->internalClasses[EngineBase::Class_ObjectProto]->find(s.engine->id_constructor()) == Heap::FunctionObject::Index_ProtoConstructor);
+        ScopedObject proto(s, s.engine->newObject(s.engine->internalClasses(EngineBase::Class_ObjectProto)));
+        Q_ASSERT(s.engine->internalClasses(EngineBase::Class_ObjectProto)->find(s.engine->id_constructor()) == Heap::FunctionObject::Index_ProtoConstructor);
         proto->setProperty(Heap::FunctionObject::Index_ProtoConstructor, d());
         setProperty(Heap::FunctionObject::Index_Prototype, proto);
     } else {
@@ -175,7 +175,7 @@ ReturnedValue FunctionObject::call(const FunctionObject *, const Value *, const
 
 Heap::FunctionObject *FunctionObject::createScriptFunction(ExecutionContext *scope, Function *function)
 {
-    return scope->engine()->memoryManager->allocObject<ScriptFunction>(scope, function);
+    return scope->engine()->memoryManager->allocate<ScriptFunction>(scope, function);
 }
 
 bool FunctionObject::isBinding() const
@@ -389,8 +389,7 @@ ReturnedValue ScriptFunction::callAsConstructor(const FunctionObject *fo, const
     const ScriptFunction *f = static_cast<const ScriptFunction *>(fo);
 
     Scope scope(v4);
-    InternalClass *ic = f->classForConstructor();
-    ScopedValue thisObject(scope, v4->memoryManager->allocObject<Object>(ic));
+    ScopedValue thisObject(scope, v4->memoryManager->allocObject<Object>(f->classForConstructor()));
 
     ReturnedValue result = Moth::VME::exec(fo, thisObject, argv, argc);
 
@@ -432,19 +431,19 @@ void Heap::ScriptFunction::init(QV4::ExecutionContext *scope, Function *function
     }
 }
 
-InternalClass *ScriptFunction::classForConstructor() const
+Heap::InternalClass *ScriptFunction::classForConstructor() const
 {
     const Object *o = d()->protoProperty();
-    InternalClass *ic = d()->cachedClassForConstructor;
-    if (ic && ic->prototype == o->d())
-        return ic;
+    if (d()->cachedClassForConstructor && d()->cachedClassForConstructor->prototype == o->d())
+        return d()->cachedClassForConstructor;
 
-    ic = engine()->internalClasses[EngineBase::Class_Object];
+    Scope scope(engine());
+    Scoped<InternalClass> ic(scope, engine()->internalClasses(EngineBase::Class_Object));
     if (o)
         ic = ic->changePrototype(o->d());
-    d()->cachedClassForConstructor = ic;
+    d()->cachedClassForConstructor.set(scope.engine, ic->d());
 
-    return ic;
+    return ic->d();
 }
 
 DEFINE_OBJECT_VTABLE(IndexedBuiltinFunction);