Move compileModule() into qv4codegen.cpp

This is a better fit for the method. In turn, remove all the
V4_BOOTSTRAP conditions from qv4engine_p.h and make sure we don't
include or compile it in bootstrap mode.

Change-Id: I5933b0724e561313ca20c420b83e4d70e63bddf5
Reviewed-by: Simon Hausmann <[email protected]>

1 files changed, 2 insertions, 58 deletions

diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index e10bf3cf79..b65a2f2dad 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -38,9 +38,6 @@
 ****************************************************************************/
 #include <qv4engine_p.h>
 
-#include <private/qqmljslexer_p.h>
-#include <private/qqmljsparser_p.h>
-#include <private/qqmljsast_p.h>
 #include <private/qv4compileddata_p.h>
 #include <private/qv4compiler_p.h>
 #include <private/qv4compilercontext_p.h>
@@ -55,8 +52,6 @@
 #include <QRegularExpression>
 #endif
 
-#ifndef V4_BOOTSTRAP
-
 #include <qv4qmlcontext_p.h>
 #include <qv4value_p.h>
 #include <qv4object_p.h>
@@ -134,14 +129,10 @@
 #include <valgrind/memcheck.h>
 #endif
 
-#endif // #ifndef V4_BOOTSTRAP
-
 QT_BEGIN_NAMESPACE
 
 using namespace QV4;
 
-#ifndef V4_BOOTSTRAP
-
 static QBasicAtomicInt engineSerial = Q_BASIC_ATOMIC_INITIALIZER(1);
 
 ReturnedValue throwTypeError(const FunctionObject *b, const QV4::Value *, const QV4::Value *, int)
@@ -1702,7 +1693,8 @@ QQmlRefPointer<CompiledData::CompilationUnit> ExecutionEngine::compileModule(con
 QQmlRefPointer<CompiledData::CompilationUnit> ExecutionEngine::compileModule(const QUrl &url, const QString &sourceCode, const QDateTime &sourceTimeStamp)
 {
     QList<QQmlJS::DiagnosticMessage> diagnostics;
-    auto unit = compileModule(/*debugMode*/debugger() != nullptr, url.toString(), sourceCode, sourceTimeStamp, &diagnostics);
+    auto unit = Compiler::Codegen::compileModule(/*debugMode*/debugger() != nullptr, url.toString(),
+                                                 sourceCode, sourceTimeStamp, &diagnostics);
     for (const QQmlJS::DiagnosticMessage &m : diagnostics) {
         if (m.isError()) {
             throwSyntaxError(m.message, url.toString(), m.loc.startLine, m.loc.startColumn);
@@ -1715,52 +1707,6 @@ QQmlRefPointer<CompiledData::CompilationUnit> ExecutionEngine::compileModule(con
     return unit;
 }
 
-#endif // ifndef V4_BOOTSTRAP
-
-QQmlRefPointer<CompiledData::CompilationUnit> ExecutionEngine::compileModule(bool debugMode, const QString &url, const QString &sourceCode,
-                                                                             const QDateTime &sourceTimeStamp, QList<QQmlJS::DiagnosticMessage> *diagnostics)
-{
-    QQmlJS::Engine ee;
-    QQmlJS::Lexer lexer(&ee);
-    lexer.setCode(sourceCode, /*line*/1, /*qml mode*/false);
-    QQmlJS::Parser parser(&ee);
-
-    const bool parsed = parser.parseModule();
-
-    if (diagnostics)
-        *diagnostics = parser.diagnosticMessages();
-
-    if (!parsed)
-        return nullptr;
-
-    QQmlJS::AST::ESModule *moduleNode = QQmlJS::AST::cast<QQmlJS::AST::ESModule*>(parser.rootNode());
-    if (!moduleNode) {
-        // if parsing was successful, and we have no module, then
-        // the file was empty.
-        if (diagnostics)
-            diagnostics->clear();
-        return nullptr;
-    }
-
-    using namespace QV4::Compiler;
-    Compiler::Module compilerModule(debugMode);
-    compilerModule.unitFlags |= CompiledData::Unit::IsESModule;
-    compilerModule.sourceTimeStamp = sourceTimeStamp;
-    JSUnitGenerator jsGenerator(&compilerModule);
-    Codegen cg(&jsGenerator, /*strictMode*/true);
-    cg.generateFromModule(url, url, sourceCode, moduleNode, &compilerModule);
-    auto errors = cg.errors();
-    if (diagnostics)
-        *diagnostics << errors;
-
-    if (!errors.isEmpty())
-        return nullptr;
-
-    return cg.generateCompilationUnit();
-}
-
-#ifndef V4_BOOTSTRAP
-
 void ExecutionEngine::injectModule(const QQmlRefPointer<CompiledData::CompilationUnit> &moduleUnit)
 {
     // Injection can happen from the QML type loader thread for example, but instantiation and
@@ -2050,6 +1996,4 @@ static QObject *qtObjectFromJS(QV4::ExecutionEngine *engine, const QV4::Value &v
     return wrapper->object();
 }
 
-#endif // ifndef V4_BOOTSTRAP
-
 QT_END_NAMESPACE