1 files changed, 15 insertions, 13 deletions

diff --git a/tests/auto/qml/qmldiskcache/tst_qmldiskcache.cpp b/tests/auto/qml/qmldiskcache/tst_qmldiskcache.cpp
index e75e51ed29..cdc9f29aab 100644
--- a/tests/auto/qml/qmldiskcache/tst_qmldiskcache.cpp
+++ b/tests/auto/qml/qmldiskcache/tst_qmldiskcache.cpp
@@ -30,10 +30,9 @@
 
 #include <private/qv4compileddata_p.h>
 #include <private/qv4compiler_p.h>
-#include <private/qv4jsir_p.h>
-#include <private/qv4isel_p.h>
 #include <private/qv8engine_p.h>
 #include <private/qv4engine_p.h>
+#include <private/qv4codegen_p.h>
 #include <QQmlComponent>
 #include <QQmlEngine>
 #include <QQmlFileSelector>
@@ -174,9 +173,8 @@ struct TestCompiler
 
     bool verify()
     {
-        QV4::ExecutionEngine *v4 = QV8Engine::getV4(engine);
-        QQmlRefPointer<QV4::CompiledData::CompilationUnit> unit = v4->iselFactory->createUnitForLoading();
-        return unit->loadFromDisk(QUrl::fromLocalFile(testFilePath), QFileInfo(testFilePath).lastModified(), v4->iselFactory.data(), &lastErrorString);
+        QQmlRefPointer<QV4::CompiledData::CompilationUnit> unit = QV4::Compiler::Codegen::createUnitForLoading();
+        return unit->loadFromDisk(QUrl::fromLocalFile(testFilePath), QFileInfo(testFilePath).lastModified(), &lastErrorString);
     }
 
     void closeMapping()
@@ -231,12 +229,14 @@ void tst_qmldiskcache::regenerateAfterChange()
         const QV4::CompiledData::Object *obj = testUnit->objectAt(0);
         QCOMPARE(quint32(obj->nBindings), quint32(1));
         QCOMPARE(quint32(obj->bindingTable()->type), quint32(QV4::CompiledData::Binding::Type_Script));
-        QCOMPARE(quint32(obj->bindingTable()->value.compiledScriptIndex), quint32(1));
+        QCOMPARE(quint32(obj->bindingTable()->value.compiledScriptIndex), quint32(0));
 
-        QCOMPARE(quint32(testUnit->functionTableSize), quint32(2));
+        QCOMPARE(quint32(testUnit->functionTableSize), quint32(1));
 
-        const QV4::CompiledData::Function *bindingFunction = testUnit->functionAt(1);
-        QVERIFY(bindingFunction->codeOffset > testUnit->unitSize);
+        const QV4::CompiledData::Function *bindingFunction = testUnit->functionAt(0);
+        QCOMPARE(testUnit->stringAt(bindingFunction->nameIndex), QString("expression for blah")); // check if we have the correct function
+        QVERIFY(bindingFunction->codeSize > 0);
+        QVERIFY(bindingFunction->codeOffset < testUnit->unitSize);
     }
 
     {
@@ -257,10 +257,12 @@ void tst_qmldiskcache::regenerateAfterChange()
         QCOMPARE(quint32(obj->bindingTable()->type), quint32(QV4::CompiledData::Binding::Type_Number));
         QCOMPARE(obj->bindingTable()->valueAsNumber(), double(42));
 
-        QCOMPARE(quint32(testUnit->functionTableSize), quint32(2));
+        QCOMPARE(quint32(testUnit->functionTableSize), quint32(1));
 
-        const QV4::CompiledData::Function *bindingFunction = testUnit->functionAt(1);
-        QVERIFY(bindingFunction->codeOffset > testUnit->unitSize);
+        const QV4::CompiledData::Function *bindingFunction = testUnit->functionAt(0);
+        QCOMPARE(testUnit->stringAt(bindingFunction->nameIndex), QString("expression for blah")); // check if we have the correct function
+        QVERIFY(bindingFunction->codeSize > 0);
+        QVERIFY(bindingFunction->codeOffset < testUnit->unitSize);
     }
 }
 
@@ -364,7 +366,7 @@ void tst_qmldiskcache::basicVersionChecks()
         });
 
         QVERIFY(!testCompiler.verify());
-        QCOMPARE(testCompiler.lastErrorString, QString::fromUtf8("Code generator mismatch. Found code generated by  but expected %1").arg(QV8Engine::getV4(&engine)->iselFactory->codeGeneratorName));
+        QCOMPARE(testCompiler.lastErrorString, QString::fromUtf8("Code generator mismatch. Found code generated by  but expected %1").arg(QStringLiteral("moth")));
     }
 }