Merge remote-tracking branch 'origin/5.13' into HEAD

 Conflicts:
	src/qml/compiler/qv4compileddata_p.h
	src/qml/jit/qv4baselinejit.cpp
	src/qml/jit/qv4jithelpers.cpp
	src/qml/jsruntime/qv4lookup.cpp
	src/qml/jsruntime/qv4runtime.cpp
	src/qml/jsruntime/qv4runtimeapi_p.h
	src/qml/jsruntime/qv4vme_moth.cpp
	src/qml/qml/qqmltypemodule_p.h

Change-Id: If28793e9e08418457a11fc2c5832f03cab2fcc76

2 files changed, 15 insertions, 28 deletions

diff --git a/tools/qmlcachegen/qmlcachegen.cpp b/tools/qmlcachegen/qmlcachegen.cpp
index f7891e7d4b..f6f1d99526 100644
--- a/tools/qmlcachegen/qmlcachegen.cpp
+++ b/tools/qmlcachegen/qmlcachegen.cpp
@@ -55,17 +55,8 @@ QSet<QString> illegalNames;
 
 void setupIllegalNames()
 {
-    // #### this in incomplete
-    illegalNames.insert(QStringLiteral("Math"));
-    illegalNames.insert(QStringLiteral("Array"));
-    illegalNames.insert(QStringLiteral("String"));
-    illegalNames.insert(QStringLiteral("Function"));
-    illegalNames.insert(QStringLiteral("Boolean"));
-    illegalNames.insert(QStringLiteral("Number"));
-    illegalNames.insert(QStringLiteral("Date"));
-    illegalNames.insert(QStringLiteral("RegExp"));
-    illegalNames.insert(QStringLiteral("Error"));
-    illegalNames.insert(QStringLiteral("Object"));
+    for (const char **g = QV4::Compiler::Codegen::s_globalNames; *g != nullptr; ++g)
+        illegalNames.insert(QString::fromLatin1(*g));
 }
 
 struct Error
@@ -212,16 +203,14 @@ static bool compileQmlFile(const QString &inputFileName, SaveFunction saveFuncti
         QmlIR::JSCodeGen v4CodeGen(irDocument.code,
                                    &irDocument.jsGenerator, &irDocument.jsModule,
                                    &irDocument.jsParserEngine, irDocument.program,
-                                   /*import cache*/nullptr, &irDocument.jsGenerator.stringTable, illegalNames);
+                                   &irDocument.jsGenerator.stringTable, illegalNames);
         v4CodeGen.setUseFastLookups(false); // Disable lookups in non-standalone (aka QML) mode
         for (QmlIR::Object *object: qAsConst(irDocument.objects)) {
             if (object->functionsAndExpressions->count == 0)
                 continue;
             QList<QmlIR::CompiledFunctionOrExpression> functionsToCompile;
-            for (QmlIR::CompiledFunctionOrExpression *foe = object->functionsAndExpressions->first; foe; foe = foe->next) {
-                foe->disableAcceleratedLookups = true;
+            for (QmlIR::CompiledFunctionOrExpression *foe = object->functionsAndExpressions->first; foe; foe = foe->next)
                 functionsToCompile << *foe;
-            }
             const QVector<int> runtimeFunctionIndices = v4CodeGen.generateJSCodeForFunctionsAndBindings(functionsToCompile);
             QList<QQmlJS::DiagnosticMessage> jsErrors = v4CodeGen.errors();
             if (!jsErrors.isEmpty()) {
@@ -319,8 +308,7 @@ static bool compileJSFile(const QString &inputFileName, const QString &inputFile
         {
             QmlIR::JSCodeGen v4CodeGen(irDocument.code, &irDocument.jsGenerator,
                                        &irDocument.jsModule, &irDocument.jsParserEngine,
-                                       irDocument.program, /*import cache*/nullptr,
-                                       &irDocument.jsGenerator.stringTable, illegalNames);
+                                       irDocument.program, &irDocument.jsGenerator.stringTable, illegalNames);
             v4CodeGen.setUseFastLookups(false); // Disable lookups in non-standalone (aka QML) mode
             v4CodeGen.generateFromProgram(inputFileName, inputFileUrl, sourceCode, program,
                                           &irDocument.jsModule, QV4::Compiler::ContextType::ScriptImportedByQML);
diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp
index 60e0f1773f..616de9e80d 100644
--- a/tools/qmlimportscanner/main.cpp
+++ b/tools/qmlimportscanner/main.cpp
@@ -89,13 +89,13 @@ QVariantList findImportsInAst(QQmlJS::AST::UiHeaderItemList *headerItemList, con
 {
     QVariantList imports;
 
-    // extract uri and version from the imports (which look like "import Foo.Bar 1.2.3")
+    // Extract uri and version from the imports (which look like "import Foo.Bar 1.2.3")
     for (QQmlJS::AST::UiHeaderItemList *headerItemIt = headerItemList; headerItemIt; headerItemIt = headerItemIt->next) {
         QVariantMap import;
         QQmlJS::AST::UiImport *importNode = QQmlJS::AST::cast<QQmlJS::AST::UiImport *>(headerItemIt->headerItem);
         if (!importNode)
             continue;
-        // handle directory imports
+        // Handle directory imports
         if (!importNode->fileName.isEmpty()) {
             QString name = importNode->fileName.toString();
             import[nameLiteral()] = name;
@@ -137,7 +137,7 @@ QVariantMap pluginsForModulePath(const QString &modulePath) {
 
     qmldirFile.open(QIODevice::ReadOnly | QIODevice::Text);
 
-    // a qml import may contain several plugins
+    // A qml import may contain several plugins
     QString plugins;
     QString classnames;
     QStringList dependencies;
@@ -206,7 +206,7 @@ QPair<QString, QString> resolveImportPath(const QString &uri, const QString &ver
             }
         }
 
-        // remove the last version digit; stop if there are none left
+        // Remove the last version digit; stop if there are none left
         if (ver.isEmpty())
             break;
 
@@ -426,7 +426,7 @@ QVariantList findQmlImportsInDirectory(const QString &qmlDir)
         if (std::find_if(blacklist.cbegin(), blacklist.cend(), pathStartsWith(path)) != blacklist.cend())
             continue;
 
-        // skip obvious build output directories
+        // Skip obvious build output directories
         if (path.contains(QLatin1String("Debug-iphoneos")) || path.contains(QLatin1String("Release-iphoneos")) ||
             path.contains(QLatin1String("Debug-iphonesimulator")) || path.contains(QLatin1String("Release-iphonesimulator"))
 #ifdef Q_OS_WIN
@@ -455,30 +455,29 @@ QSet<QString> importModulePaths(const QVariantList &imports) {
     return ret;
 }
 
-// Find Qml Imports Recursively from a root set of qml files.
+// Find qml imports recursively from a root set of qml files.
 // The directories in qmlDirs are searched recursively.
 // The files in qmlFiles parsed directly.
 QVariantList findQmlImportsRecursively(const QStringList &qmlDirs, const QStringList &scanFiles)
 {
     QVariantList ret;
 
-    // scan all app root qml directories for imports
+    // Scan all app root qml directories for imports
     for (const QString &qmlDir : qmlDirs) {
         QVariantList imports = findQmlImportsInDirectory(qmlDir);
         ret = mergeImports(ret, imports);
     }
 
-    // scan app qml files for imports
+    // Scan app qml files for imports
     for (const QString &file : scanFiles) {
         QVariantList imports = findQmlImportsInFile(file);
         ret = mergeImports(ret, imports);
     }
 
-
-    // get the paths to theimports found in the app qml
+    // Get the paths to the imports found in the app qml
     QSet<QString> toVisit = importModulePaths(ret);
 
-    // recursivly scan for import dependencies.
+    // Recursively scan for import dependencies.
     QSet<QString> visited;
     while (!toVisit.isEmpty()) {
         QString qmlDir = *toVisit.begin();