Merge caches with same key in Evaluator

Reduce hash lookups and memory footprint.

========== Performance data for Resolving ==========
    Old instruction count: 2465977485
    New instruction count: 2457362647
    Relative change: -1 %
    Old peak memory usage: 21248960 Bytes
    New peak memory usage: 21237680 Bytes
    Relative change: -1 %
========== Performance data for Rule Execution ==========
    Old instruction count: 4898426038
    New instruction count: 4857983226
    Relative change: -1 %
    Old peak memory usage: 27604240 Bytes
    New peak memory usage: 27593424 Bytes
    Relative change: -1 %
========== Performance data for Null Build ==========
    Old instruction count: 4509789474
    New instruction count: 4490616946
    Relative change: -1 %
    Old peak memory usage: 30680456 Bytes
    New peak memory usage: 30670784 Bytes
    Relative change: -1 %

Change-Id: Ie613447cf9da4bc3d2bfdab42c9a9b5ace643540
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 9 insertions, 4 deletions

diff --git a/src/lib/corelib/language/evaluator.h b/src/lib/corelib/language/evaluator.h
index 759cc5d4e..b602326ca 100644
--- a/src/lib/corelib/language/evaluator.h
+++ b/src/lib/corelib/language/evaluator.h
@@ -75,8 +75,14 @@ public:
     QStringList stringListValue(const Item *item, const QString &name, bool *propertyWasSet = 0);
 
     QScriptValue scriptValue(const Item *item);
-    QScriptValue fileScope(const FileContextConstPtr &file);
-    QScriptValue importScope(const FileContextConstPtr &file);
+
+    struct FileContextScopes
+    {
+        QScriptValue fileScope;
+        QScriptValue importScope;
+    };
+
+    FileContextScopes fileContextScopes(const FileContextConstPtr &file);
 
     void setCachingEnabled(bool enabled);
 
@@ -93,8 +99,7 @@ private:
     ScriptEngine *m_scriptEngine;
     EvaluatorScriptClass *m_scriptClass;
     mutable QHash<const Item *, QScriptValue> m_scriptValueMap;
-    mutable QHash<FileContextConstPtr, QScriptValue> m_fileScopeMap;
-    mutable QHash<FileContextConstPtr, QScriptValue> m_importScopeMap;
+    mutable QHash<FileContextConstPtr, FileContextScopes> m_fileContextScopesMap;
 };
 
 class EvalCacheEnabler