V4: allow for String::createHashValue to be inlined

Notably into QHashedString(Ref)::computeHash.

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

1 files changed, 32 insertions, 3 deletions

diff --git a/src/qml/qml/ftw/qhashedstring_p.h b/src/qml/qml/ftw/qhashedstring_p.h
index 03361f47f7..9ee50ec931 100644
--- a/src/qml/qml/ftw/qhashedstring_p.h
+++ b/src/qml/qml/ftw/qhashedstring_p.h
@@ -85,11 +85,15 @@ public:
     static bool compare(const QChar *lhs, const QChar *rhs, int length);
     static inline bool compare(const QChar *lhs, const char *rhs, int length);
     static inline bool compare(const char *lhs, const char *rhs, int length);
+
+    static inline quint32 stringHash(const QChar* data, int length);
+    static inline quint32 stringHash(const char *data, int length);
+
 private:
     friend class QHashedStringRef;
     friend class QStringHashNode;
 
-    void computeHash() const;
+    inline void computeHash() const;
     mutable quint32 m_hash;
 };
 
@@ -136,7 +140,7 @@ public:
 private:
     friend class QHashedString;
 
-    void computeHash() const;
+    inline void computeHash() const;
 
     const QChar *m_data;
     int m_length;
@@ -163,7 +167,7 @@ public:
 private:
     friend class QHashedStringRef;
 
-    void computeHash() const;
+    inline void computeHash() const;
 
     const char *m_data;
     int m_length;
@@ -1214,6 +1218,11 @@ bool QHashedStringRef::isLatin1() const
     return true;
 }
 
+void QHashedStringRef::computeHash() const
+{
+    m_hash = QHashedString::stringHash(m_data, m_length);
+}
+
 bool QHashedStringRef::startsWithUpper() const
 {
     if (m_length < 1) return false;
@@ -1280,6 +1289,11 @@ void QHashedCStringRef::writeUtf16(quint16 *output) const
         *output++ = *d++;
 }
 
+void QHashedCStringRef::computeHash() const
+{
+    m_hash = QHashedString::stringHash(m_data, m_length);
+}
+
 bool QHashedString::compare(const QChar *lhs, const char *rhs, int length)
 {
     Q_ASSERT(lhs && rhs);
@@ -1295,6 +1309,21 @@ bool QHashedString::compare(const char *lhs, const char *rhs, int length)
     return 0 == ::memcmp(lhs, rhs, length);
 }
 
+quint32 QHashedString::stringHash(const QChar *data, int length)
+{
+    return QV4::String::createHashValue(data, length, Q_NULLPTR);
+}
+
+quint32 QHashedString::stringHash(const char *data, int length)
+{
+    return QV4::String::createHashValue(data, length, Q_NULLPTR);
+}
+
+void QHashedString::computeHash() const
+{
+    m_hash = stringHash(constData(), length());
+}
+
 QT_END_NAMESPACE
 
 #endif // QHASHEDSTRING_P_H