1 files changed, 9 insertions, 10 deletions

diff --git a/src/qml/jsruntime/qv4function.cpp b/src/qml/jsruntime/qv4function.cpp
index 6fca9ecd45..131d3406d2 100644
--- a/src/qml/jsruntime/qv4function.cpp
+++ b/src/qml/jsruntime/qv4function.cpp
@@ -52,27 +52,26 @@ QT_BEGIN_NAMESPACE
 
 using namespace QV4;
 
-Function::Function(ExecutionEngine *engine, CompiledData::CompilationUnit *unit, const CompiledData::Function *function, Code codePtr)
+Function::Function(ExecutionEngine *engine, CompiledData::CompilationUnit *unit, const CompiledData::Function *function)
         : compiledFunction(function)
         , compilationUnit(unit)
-        , code(codePtr)
         , codeData(function->code())
         , jittedCode(nullptr)
         , codeRef(nullptr)
         , hasQmlDependencies(function->hasQmlDependencies())
 {
-    Q_UNUSED(engine);
-
-    internalClass = engine->internalClasses[EngineBase::Class_CallContext];
+    Scope scope(engine);
+    Scoped<InternalClass> ic(scope, engine->internalClasses(EngineBase::Class_CallContext));
 
     // first locals
     const quint32_le *localsIndices = compiledFunction->localsTable();
     for (quint32 i = 0; i < compiledFunction->nLocals; ++i)
-        internalClass = internalClass->addMember(engine->identifierTable->identifier(compilationUnit->runtimeStrings[localsIndices[i]]), Attr_NotConfigurable);
+        ic = ic->addMember(engine->identifierTable->identifier(compilationUnit->runtimeStrings[localsIndices[i]]), Attr_NotConfigurable);
 
     const quint32_le *formalsIndices = compiledFunction->formalsTable();
     for (quint32 i = 0; i < compiledFunction->nFormals; ++i)
-        internalClass = internalClass->addMember(engine->identifierTable->identifier(compilationUnit->runtimeStrings[formalsIndices[i]]), Attr_NotConfigurable);
+        ic = ic->addMember(engine->identifierTable->identifier(compilationUnit->runtimeStrings[formalsIndices[i]]), Attr_NotConfigurable);
+    internalClass = ic->d();
 
     nFormals = compiledFunction->nFormals;
 }
@@ -110,7 +109,7 @@ void Function::updateInternalClass(ExecutionEngine *engine, const QList<QByteArr
 
     }
 
-    internalClass = engine->internalClasses[EngineBase::Class_CallContext];
+    internalClass = engine->internalClasses(EngineBase::Class_CallContext);
 
     // first locals
     const quint32_le *localsIndices = compiledFunction->localsTable();
@@ -120,8 +119,8 @@ void Function::updateInternalClass(ExecutionEngine *engine, const QList<QByteArr
     Scope scope(engine);
     ScopedString arg(scope);
     for (const QString &parameterName : parameterNames) {
-        arg = engine->newString(parameterName);
-        internalClass = internalClass->addMember(arg, Attr_NotConfigurable);
+        arg = engine->newIdentifier(parameterName);
+        internalClass = internalClass->addMember(arg->identifier(), Attr_NotConfigurable);
     }
     nFormals = parameters.size();
 }