Micro optimization of StringPool

In destructor we do not need to create a copy off all pointers.

By hiding StringPool::strings in class private
section we reduce risk of it being accidentally copied.

Change-Id: I1b9df6bf9e49bd6926e84b8eac6b3d904277e50a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

diff --git a/qmljs_engine.cpp b/qmljs_engine.cpp
index 1940a4f..78fd64b 100644 (file)
--- a/qmljs_engine.cpp
+++ b/qmljs_engine.cpp
@@ -46,12 +46,14 @@
 namespace QQmlJS {
 namespace VM {
 
-struct StringPool
+class StringPool
 {
     QHash<QString, String*> strings;
-
+public:
     ~StringPool()
-    { qDeleteAll(strings.values()); }
+    {
+        qDeleteAll(strings);
+    }
 
     String *newString(const QString &s)
     {

diff --git a/qmljs_engine.h b/qmljs_engine.h
index 94093cb..dd856f6 100644 (file)
--- a/qmljs_engine.h
+++ b/qmljs_engine.h
@@ -154,7 +154,7 @@ struct ExecutionEngine
     QVector<ExceptionHandler> unwindStack;
     Value exception;
 
-    QScopedPointer<struct StringPool> stringPool;
+    QScopedPointer<class StringPool> stringPool;
     QVector<Function *> functions;
 
     ExecutionEngine(MemoryManager *memoryManager, EvalISelFactory *iselFactory);

diff --git a/qmljs_objects.h b/qmljs_objects.h
index 18b5271..eacbc00 100644 (file)
--- a/qmljs_objects.h
+++ b/qmljs_objects.h
@@ -136,7 +136,7 @@ struct String {
     }
 
 private:
-    friend struct StringPool;
+    friend class StringPool;
     String(const QString &text)
         : _text(text), _hashValue(0) {}
 

diff --git a/qv4mm.cpp b/qv4mm.cpp
index 322ad97..a5215cd 100644 (file)
--- a/qv4mm.cpp
+++ b/qv4mm.cpp
@@ -45,6 +45,7 @@ using namespace QQmlJS::VM;
 
 static const std::size_t CHUNK_SIZE = 65536;
 
+class StringPool;
 struct MemoryManager::Data
 {
     bool enableGC;