1 files changed, 13 insertions, 14 deletions
diff --git a/src/qml/jsruntime/qv4identifiertable.cpp b/src/qml/jsruntime/qv4identifiertable.cpp
index 96aa54018b..4c915442f4 100644
--- a/src/qml/jsruntime/qv4identifiertable.cpp
+++ b/src/qml/jsruntime/qv4identifiertable.cpp
@@ -36,7 +36,7 @@ void IdentifierTable::addEntry(Heap::StringOrSymbol *str)
     if (str->subtype == Heap::String::StringType_ArrayIndex)
         return;
 
-    str->identifier = PropertyKey::fromStringOrSymbol(str);
+    str->identifier = PropertyKey::fromStringOrSymbol(engine, str);
 
     bool grow = (alloc <= size*2);
 
@@ -165,6 +165,9 @@ PropertyKey IdentifierTable::asPropertyKeyImpl(const Heap::String *str)
     while (Heap::StringOrSymbol *e = entriesByHash[idx]) {
         if (e->stringHash == hash && e->toQString() == str->toQString()) {
             str->identifier = e->identifier;
+            QV4::WriteBarrier::markCustom(engine, [&](QV4::MarkStack *stack) {
+                e->identifier.asStringOrSymbol()->mark(stack);
+            });
             return e->identifier;
         }
         ++idx;
@@ -249,24 +252,20 @@ void IdentifierTable::sweep()
     size -= freed;
 }
 
-PropertyKey IdentifierTable::asPropertyKey(const QString &s)
+PropertyKey IdentifierTable::asPropertyKey(const QString &s,
+                                           IdentifierTable::KeyConversionBehavior conversionBehvior)
 {
     uint subtype;
-    const uint hash = String::createHashValue(s.constData(), s.size(), &subtype);
-    if (subtype == Heap::String::StringType_ArrayIndex)
-        return PropertyKey::fromArrayIndex(hash);
+    uint hash = String::createHashValue(s.constData(), s.size(), &subtype);
+    if (subtype == Heap::String::StringType_ArrayIndex) {
+        if (Q_UNLIKELY(conversionBehvior == ForceConversionToId))
+            hash = String::createHashValueDisallowingArrayIndex(s.constData(), s.size(), &subtype);
+        else
+            return PropertyKey::fromArrayIndex(hash);
+    }
     return resolveStringEntry(s, hash, subtype)->identifier;
 }
 
-PropertyKey IdentifierTable::asPropertyKey(const char *s, int len)
-{
-    uint subtype;
-    uint hash = String::createHashValue(s, len, &subtype);
-    if (subtype == Heap::String::StringType_ArrayIndex)
-        return PropertyKey::fromArrayIndex(hash);
-    return resolveStringEntry(QString::fromLatin1(s, len), hash, subtype)->identifier;
-}
-
 }
 
 QT_END_NAMESPACE