Add a static toArrayIndex() method to QV4::String

This avoids a hack in QV4::Codegen where we created a V4::String
on the stack to convert to an array index.

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

3 files changed, 12 insertions, 4 deletions

diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp
index a8338f8656..a920f1b419 100644
--- a/src/qml/compiler/qv4codegen.cpp
+++ b/src/qml/compiler/qv4codegen.cpp
@@ -1632,7 +1632,7 @@ bool Codegen::visit(ObjectLiteral *ast)
     if (!valueMap.isEmpty()) {
         V4IR::ExprList *current;
         for (QMap<QString, ObjectPropertyValue>::iterator it = valueMap.begin(); it != valueMap.end(); ) {
-            if (QV4::String(0, it.key()).asArrayIndex() != UINT_MAX) {
+            if (QV4::String::toArrayIndex(it.key()) != UINT_MAX) {
                 ++it;
                 continue;
             }
diff --git a/src/qml/jsruntime/qv4string.cpp b/src/qml/jsruntime/qv4string.cpp
index 7ac83ced02..37508e79f6 100644
--- a/src/qml/jsruntime/qv4string.cpp
+++ b/src/qml/jsruntime/qv4string.cpp
@@ -359,7 +359,7 @@ void String::createHashValue() const
 
     // array indices get their number as hash value
     bool ok;
-    stringHash = toArrayIndex(ch, end, &ok);
+    stringHash = ::toArrayIndex(ch, end, &ok);
     if (ok) {
         subtype = (stringHash == UINT_MAX) ? StringType_UInt : StringType_ArrayIndex;
         return;
@@ -381,7 +381,7 @@ uint String::createHashValue(const QChar *ch, int length)
 
     // array indices get their number as hash value
     bool ok;
-    uint stringHash = toArrayIndex(ch, end, &ok);
+    uint stringHash = ::toArrayIndex(ch, end, &ok);
     if (ok)
         return stringHash;
 
@@ -400,7 +400,7 @@ uint String::createHashValue(const char *ch, int length)
 
     // array indices get their number as hash value
     bool ok;
-    uint stringHash = toArrayIndex(ch, end, &ok);
+    uint stringHash = ::toArrayIndex(ch, end, &ok);
     if (ok)
         return stringHash;
 
@@ -414,3 +414,9 @@ uint String::createHashValue(const char *ch, int length)
 
     return h;
 }
+
+uint String::toArrayIndex(const QString &str)
+{
+    bool ok;
+    return ::toArrayIndex(str.constData(), str.constData() + str.length(), &ok);
+}
diff --git a/src/qml/jsruntime/qv4string_p.h b/src/qml/jsruntime/qv4string_p.h
index bb6f1d2279..545e08de78 100644
--- a/src/qml/jsruntime/qv4string_p.h
+++ b/src/qml/jsruntime/qv4string_p.h
@@ -140,6 +140,8 @@ struct Q_QML_EXPORT String : public Managed {
         return len;
     }
 
+    static uint toArrayIndex(const QString &str);
+
     union {
         mutable QStringData *_text;
         mutable String *left;