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

Change-Id: I2842f4a8096c4555e29f08e65b88b77b841441cb

3 files changed, 5 insertions, 2 deletions

diff --git a/src/qml/compiler/qqmlirbuilder_p.h b/src/qml/compiler/qqmlirbuilder_p.h
index 5dd4d1800f..fd607aee8d 100644
--- a/src/qml/compiler/qqmlirbuilder_p.h
+++ b/src/qml/compiler/qqmlirbuilder_p.h
@@ -559,6 +559,7 @@ struct Q_QML_PRIVATE_EXPORT JSCodeGen : public QV4::Compiler::Codegen
 
 protected:
     void beginFunctionBodyHook() override;
+    bool canAccelerateGlobalLookups() const override { return !_disableAcceleratedLookups; }
     Reference fallbackNameLookup(const QString &name) override;
 
 private:
diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp
index a0a2a17b0f..17869bcc84 100644
--- a/src/qml/compiler/qv4codegen.cpp
+++ b/src/qml/compiler/qv4codegen.cpp
@@ -2404,7 +2404,7 @@ Codegen::Reference Codegen::referenceForName(const QString &name, bool isLhs, co
 
     Reference r = Reference::fromName(this, name);
     r.global = useFastLookups && (resolved.type == Context::ResolvedName::Global);
-    if (!r.global && m_globalNames.contains(name))
+    if (!r.global && canAccelerateGlobalLookups() && m_globalNames.contains(name))
         r.global = true;
     return r;
 }
diff --git a/src/qml/compiler/qv4codegen_p.h b/src/qml/compiler/qv4codegen_p.h
index 3f96afc7c2..4d7001fe64 100644
--- a/src/qml/compiler/qv4codegen_p.h
+++ b/src/qml/compiler/qv4codegen_p.h
@@ -561,8 +561,10 @@ protected:
 
     Reference referenceForPropertyName(const Codegen::Reference &object, AST::PropertyName *name);
 
-    // Hook provided to implement QML lookup semantics
+    // Hooks provided to implement QML lookup semantics
+    virtual bool canAccelerateGlobalLookups() const { return true; }
     virtual Reference fallbackNameLookup(const QString &name);
+
     virtual void beginFunctionBodyHook() {}
 
     void emitReturn(const Reference &expr);