Move QQmlIR::IRLoader out of qqmlirbuilder*

We don't need it to build the IR and we can drop a few checks for
V4_BOOTSTRAP this way.

Change-Id: I9464e65528c70c42ebc8ddad576eaab001dc9d2f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 0 insertions, 164 deletions

diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp
index 04d116ddee..28e7daecd5 100644
--- a/src/qml/compiler/qqmlirbuilder.cpp
+++ b/src/qml/compiler/qqmlirbuilder.cpp
@@ -1911,167 +1911,3 @@ QVector<int> JSCodeGen::generateJSCodeForFunctionsAndBindings(const QList<Compil
 
     return runtimeFunctionIndices;
 }
-
-#ifndef V4_BOOTSTRAP
-
-IRLoader::IRLoader(const QV4::CompiledData::Unit *qmlData, QmlIR::Document *output)
-    : unit(qmlData)
-    , output(output)
-{
-    pool = output->jsParserEngine.pool();
-}
-
-void IRLoader::load()
-{
-    output->jsGenerator.stringTable.initializeFromBackingUnit(unit);
-
-    const QV4::CompiledData::QmlUnit *qmlUnit = unit->qmlUnit();
-
-    for (quint32 i = 0; i < qmlUnit->nImports; ++i)
-        output->imports << qmlUnit->importAt(i);
-
-    if (unit->flags & QV4::CompiledData::Unit::IsSingleton) {
-        QmlIR::Pragma *p = New<QmlIR::Pragma>();
-        p->location = QV4::CompiledData::Location();
-        p->type = QmlIR::Pragma::PragmaSingleton;
-        output->pragmas << p;
-    }
-
-    for (uint i = 0; i < qmlUnit->nObjects; ++i) {
-        const QV4::CompiledData::Object *serializedObject = qmlUnit->objectAt(i);
-        QmlIR::Object *object = loadObject(serializedObject);
-        output->objects.append(object);
-    }
-}
-
-struct FakeExpression : public QQmlJS::AST::NullExpression
-{
-    FakeExpression(int start, int length)
-        : location(start, length)
-    {}
-
-    virtual QQmlJS::AST::SourceLocation firstSourceLocation() const
-    { return location; }
-
-    virtual QQmlJS::AST::SourceLocation lastSourceLocation() const
-    { return location; }
-
-private:
-    QQmlJS::AST::SourceLocation location;
-};
-
-QmlIR::Object *IRLoader::loadObject(const QV4::CompiledData::Object *serializedObject)
-{
-    QmlIR::Object *object = pool->New<QmlIR::Object>();
-    object->init(pool, serializedObject->inheritedTypeNameIndex, serializedObject->idNameIndex);
-
-    object->indexOfDefaultPropertyOrAlias = serializedObject->indexOfDefaultPropertyOrAlias;
-    object->defaultPropertyIsAlias = serializedObject->defaultPropertyIsAlias;
-    object->flags = serializedObject->flags;
-    object->id = serializedObject->id;
-    object->location = serializedObject->location;
-    object->locationOfIdProperty = serializedObject->locationOfIdProperty;
-
-    QVector<int> functionIndices;
-    functionIndices.reserve(serializedObject->nFunctions + serializedObject->nBindings / 2);
-
-    for (uint i = 0; i < serializedObject->nBindings; ++i) {
-        QmlIR::Binding *b = pool->New<QmlIR::Binding>();
-        *static_cast<QV4::CompiledData::Binding*>(b) = serializedObject->bindingTable()[i];
-        object->bindings->append(b);
-        if (b->type == QV4::CompiledData::Binding::Type_Script) {
-            functionIndices.append(b->value.compiledScriptIndex);
-            b->value.compiledScriptIndex = functionIndices.count() - 1;
-
-            QmlIR::CompiledFunctionOrExpression *foe = pool->New<QmlIR::CompiledFunctionOrExpression>();
-            foe->nameIndex = 0;
-
-            QQmlJS::AST::ExpressionNode *expr;
-
-            if (b->stringIndex != quint32(0)) {
-                const int start = output->code.length();
-                const QString script = output->stringAt(b->stringIndex);
-                const int length = script.length();
-                output->code.append(script);
-                expr = new (pool) FakeExpression(start, length);
-            } else
-                expr = new (pool) QQmlJS::AST::NullExpression();
-            foe->node = new (pool) QQmlJS::AST::ExpressionStatement(expr); // dummy
-            object->functionsAndExpressions->append(foe);
-        }
-    }
-
-    Q_ASSERT(object->functionsAndExpressions->count == functionIndices.count());
-
-    for (uint i = 0; i < serializedObject->nSignals; ++i) {
-        const QV4::CompiledData::Signal *serializedSignal = serializedObject->signalAt(i);
-        QmlIR::Signal *s = pool->New<QmlIR::Signal>();
-        s->nameIndex = serializedSignal->nameIndex;
-        s->location = serializedSignal->location;
-        s->parameters = pool->New<QmlIR::PoolList<QmlIR::SignalParameter> >();
-
-        for (uint i = 0; i < serializedSignal->nParameters; ++i) {
-            QmlIR::SignalParameter *p = pool->New<QmlIR::SignalParameter>();
-            *static_cast<QV4::CompiledData::Parameter*>(p) = *serializedSignal->parameterAt(i);
-            s->parameters->append(p);
-        }
-
-        object->qmlSignals->append(s);
-    }
-
-    for (uint i = 0; i < serializedObject->nEnums; ++i) {
-        const QV4::CompiledData::Enum *serializedEnum = serializedObject->enumAt(i);
-        QmlIR::Enum *e = pool->New<QmlIR::Enum>();
-        e->nameIndex = serializedEnum->nameIndex;
-        e->location = serializedEnum->location;
-        e->enumValues = pool->New<QmlIR::PoolList<QmlIR::EnumValue> >();
-
-        for (uint i = 0; i < serializedEnum->nEnumValues; ++i) {
-            QmlIR::EnumValue *v = pool->New<QmlIR::EnumValue>();
-            *static_cast<QV4::CompiledData::EnumValue*>(v) = *serializedEnum->enumValueAt(i);
-            e->enumValues->append(v);
-        }
-
-        object->qmlEnums->append(e);
-    }
-
-    const QV4::CompiledData::Property *serializedProperty = serializedObject->propertyTable();
-    for (uint i = 0; i < serializedObject->nProperties; ++i, ++serializedProperty) {
-        QmlIR::Property *p = pool->New<QmlIR::Property>();
-        *static_cast<QV4::CompiledData::Property*>(p) = *serializedProperty;
-        object->properties->append(p);
-    }
-
-    {
-        const QV4::CompiledData::Alias *serializedAlias = serializedObject->aliasTable();
-        for (uint i = 0; i < serializedObject->nAliases; ++i, ++serializedAlias) {
-            QmlIR::Alias *a = pool->New<QmlIR::Alias>();
-            *static_cast<QV4::CompiledData::Alias*>(a) = *serializedAlias;
-            object->aliases->append(a);
-        }
-    }
-
-    const quint32_le *functionIdx = serializedObject->functionOffsetTable();
-    for (uint i = 0; i < serializedObject->nFunctions; ++i, ++functionIdx) {
-        QmlIR::Function *f = pool->New<QmlIR::Function>();
-        const QV4::CompiledData::Function *compiledFunction = unit->functionAt(*functionIdx);
-
-        functionIndices.append(*functionIdx);
-        f->index = functionIndices.count() - 1;
-        f->location = compiledFunction->location;
-        f->nameIndex = compiledFunction->nameIndex;
-
-        f->formals.allocate(pool, int(compiledFunction->nFormals));
-        const quint32_le *formalNameIdx = compiledFunction->formalsTable();
-        for (uint i = 0; i < compiledFunction->nFormals; ++i, ++formalNameIdx)
-            f->formals[i] = *formalNameIdx;
-
-        object->functions->append(f);
-    }
-
-    object->runtimeFunctionIndices.allocate(pool, functionIndices);
-
-    return object;
-}
-
-#endif // V4_BOOTSTRAP