Remove the QString member from Identifier

First step to turning identifier into a simple int.

Change-Id: I4988587aa61f1f02ed80426ccbf00b685f38c829
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

7 files changed, 26 insertions, 33 deletions

diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
index 25ae29d8d9..c33d0026d5 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
@@ -46,6 +46,7 @@
 #include <private/qv4objectiterator_p.h>
 #include <private/qv4identifier_p.h>
 #include <private/qv4runtime_p.h>
+#include <private/qv4identifiertable_p.h>
 
 #include <private/qqmlcontext_p.h>
 #include <private/qqmlengine_p.h>
@@ -271,7 +272,7 @@ bool QV4DataCollector::collectScope(QJsonObject *dict, int frameNr, int scopeNr)
     QV4::ScopedValue v(scope);
     QV4::Heap::InternalClass *ic = ctxt->internalClass();
     for (uint i = 0; i < ic->size; ++i) {
-        QString name = ic->nameMap[i]->string;
+        QString name = scope.engine->identifierTable->stringFromIdentifier(ic->nameMap[i])->toQString();
         names.append(name);
         v = ctxt->d()->locals[i];
         collectedRefs.append(collect(v));
diff --git a/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp b/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp
index 97c7de1cde..5071f4602f 100644
--- a/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp
@@ -51,6 +51,7 @@
 #include <private/qv4runtime_p.h>
 #include <private/qversionedpacket_p.h>
 #include <private/qqmldebugserviceinterfaces_p.h>
+#include <private/qv4identifiertable_p.h>
 
 #include <QtQml/qjsengine.h>
 #include <QtCore/qjsonarray.h>
@@ -496,7 +497,7 @@ void NativeDebugger::handleVariables(QJsonObject *response, const QJsonObject &a
         QV4::Heap::InternalClass *ic = callContext->internalClass();
         QV4::ScopedValue v(scope);
         for (uint i = 0; i < ic->size; ++i) {
-            QString name = ic->nameMap[i]->string;
+            QString name = scope.engine->identifierTable->stringFromIdentifier(ic->nameMap[i])->toQString();
             v = callContext->d()->locals[i];
             collector.collect(&output, QString(), name, v);
         }
diff --git a/src/qml/jsruntime/qv4identifier.cpp b/src/qml/jsruntime/qv4identifier.cpp
index c122bcb51a..77510d95f6 100644
--- a/src/qml/jsruntime/qv4identifier.cpp
+++ b/src/qml/jsruntime/qv4identifier.cpp
@@ -38,6 +38,7 @@
 ****************************************************************************/
 #include "qv4identifier_p.h"
 #include "qv4identifiertable_p.h"
+#include "qv4string_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -150,18 +151,9 @@ const IdentifierHashEntry *IdentifierHash::lookup(const QString &str) const
 {
     if (!d)
         return nullptr;
-    Q_ASSERT(d->entries);
 
-    uint hash = String::createHashValue(str.constData(), str.length(), nullptr);
-    uint idx = hash % d->alloc;
-    while (1) {
-        if (!d->entries[idx].identifier)
-            return nullptr;
-        if (d->entries[idx].identifier->string == str)
-            return d->entries + idx;
-        ++idx;
-        idx %= d->alloc;
-    }
+    Identifier *id = d->identifierTable->identifier(str);
+    return lookup(id);
 }
 
 const IdentifierHashEntry *IdentifierHash::lookup(String *str) const
@@ -185,6 +177,18 @@ const Identifier *IdentifierHash::toIdentifier(Heap::String *str) const
     return d->identifierTable->identifier(str);
 }
 
+QString QV4::IdentifierHash::findId(int value) const
+{
+    IdentifierHashEntry *e = d->entries;
+    IdentifierHashEntry *end = e + d->alloc;
+    while (e < end) {
+        if (e->identifier && e->value == value)
+            return d->identifierTable->stringFromIdentifier(e->identifier)->toQString();
+        ++e;
+    }
+    return QString();
+}
+
 
 }
 
diff --git a/src/qml/jsruntime/qv4identifier_p.h b/src/qml/jsruntime/qv4identifier_p.h
index 82346d5f68..c0c035479e 100644
--- a/src/qml/jsruntime/qv4identifier_p.h
+++ b/src/qml/jsruntime/qv4identifier_p.h
@@ -66,7 +66,6 @@ struct ExecutionEngine;
 
 struct Identifier
 {
-    QString string;
     uint hashValue;
 };
 
@@ -180,20 +179,6 @@ inline int IdentifierHash::value(String *str) const
     return e ? e->value : -1;
 }
 
-
-inline
-QString IdentifierHash::findId(int value) const
-{
-    IdentifierHashEntry *e = d->entries;
-    IdentifierHashEntry *end = e + d->alloc;
-    while (e < end) {
-        if (e->identifier && e->value == value)
-            return e->identifier->string;
-        ++e;
-    }
-    return QString();
-}
-
 }
 
 QT_END_NAMESPACE
diff --git a/src/qml/jsruntime/qv4identifiertable.cpp b/src/qml/jsruntime/qv4identifiertable.cpp
index b77f9478d3..9a86e4259f 100644
--- a/src/qml/jsruntime/qv4identifiertable.cpp
+++ b/src/qml/jsruntime/qv4identifiertable.cpp
@@ -79,7 +79,6 @@ void IdentifierTable::addEntry(Heap::String *str)
         return;
 
     str->identifier = new Identifier;
-    str->identifier->string = str->toQString();
     str->identifier->hashValue = hash;
 
     bool grow = (alloc <= size*2);
@@ -158,7 +157,7 @@ Identifier *IdentifierTable::identifierImpl(const Heap::String *str)
     return str->identifier;
 }
 
-Heap::String *IdentifierTable::stringFromIdentifier(Identifier *i)
+Heap::String *IdentifierTable::stringFromIdentifier(const Identifier *i) const
 {
     if (!i)
         return nullptr;
diff --git a/src/qml/jsruntime/qv4identifiertable_p.h b/src/qml/jsruntime/qv4identifiertable_p.h
index b0b08f1e54..2210a866fb 100644
--- a/src/qml/jsruntime/qv4identifiertable_p.h
+++ b/src/qml/jsruntime/qv4identifiertable_p.h
@@ -91,7 +91,7 @@ public:
 
     Identifier *identifierImpl(const Heap::String *str);
 
-    Heap::String *stringFromIdentifier(Identifier *i);
+    Q_QML_PRIVATE_EXPORT Heap::String *stringFromIdentifier(const Identifier *i) const;
 
     void mark(MarkStack *markStack) {
         for (int i = 0; i < alloc; ++i) {
diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp
index 8a786e76cf..7106583e6d 100644
--- a/src/qml/qml/v8/qv8engine.cpp
+++ b/src/qml/qml/v8/qv8engine.cpp
@@ -85,6 +85,7 @@
 #include <private/qv4script_p.h>
 #include <private/qv4include_p.h>
 #include <private/qv4jsonobject_p.h>
+#include <private/qv4identifiertable_p.h>
 
 Q_DECLARE_METATYPE(QList<int>)
 
@@ -206,8 +207,10 @@ void QV8Engine::initializeGlobal()
 
     {
         for (uint i = 0; i < m_v4Engine->globalObject->internalClass()->size; ++i) {
-            if (m_v4Engine->globalObject->internalClass()->nameMap.at(i))
-                m_illegalNames.insert(m_v4Engine->globalObject->internalClass()->nameMap.at(i)->string);
+            if (m_v4Engine->globalObject->internalClass()->nameMap.at(i)) {
+                QV4::Identifier *id = m_v4Engine->globalObject->internalClass()->nameMap.at(i);
+                m_illegalNames.insert(m_v4Engine->identifierTable->stringFromIdentifier(id)->toQString());
+            }
         }
     }
 }