diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-04-14 12:04:59 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-05-02 14:19:32 +0000 |
| commit | cf4a68d5bc85877e1166117aa0d4c520509d1c0e (patch) | |
| tree | d85c79985e3a605ca44b279c2a14dc1a77b5ede2 | |
| parent | 68a71b7136cfeb010eebea6c14b138aa2a9f3d6a (diff) | |
Don't use stringForId() anymore
The identifier has a backpointer to it's heap object, which could
also be a symbol.
Change-Id: I976db1424ec66f8e41e6ce4d76620c6b57d94a62
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | src/qml/jsruntime/qv4identifier.cpp | 2 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4object.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/v8/qv8engine.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4identifier.cpp b/src/qml/jsruntime/qv4identifier.cpp index 1be24917db..4bfae14aec 100644 --- a/src/qml/jsruntime/qv4identifier.cpp +++ b/src/qml/jsruntime/qv4identifier.cpp @@ -204,7 +204,7 @@ QString QV4::IdentifierHash::findId(int value) const IdentifierHashEntry *end = e + d->alloc; while (e < end) { if (e->identifier.isValid() && e->value == value) - return d->identifierTable->stringForId(e->identifier)->toQString(); + return e->identifier.toQString(); ++e; } return QString(); diff --git a/src/qml/jsruntime/qv4object.cpp b/src/qml/jsruntime/qv4object.cpp index 261e99b168..7bb339bf0d 100644 --- a/src/qml/jsruntime/qv4object.cpp +++ b/src/qml/jsruntime/qv4object.cpp @@ -546,7 +546,7 @@ void Object::advanceIterator(Managed *m, ObjectIterator *it, Value *name, uint * PropertyAttributes a = o->internalClass()->propertyData[it->memberIndex]; ++it->memberIndex; if (!(it->flags & ObjectIterator::EnumerableOnly) || a.isEnumerable()) { - name->setM(o->engine()->identifierTable->stringForId(n)); + name->setM(n.asHeapObject()); *attrs = a; pd->value = *o->propertyData(idx); if (a.isAccessor()) diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp index 350d9b09a2..b5e25fb6d4 100644 --- a/src/qml/qml/v8/qv8engine.cpp +++ b/src/qml/qml/v8/qv8engine.cpp @@ -209,7 +209,7 @@ void QV8Engine::initializeGlobal() for (uint i = 0; i < m_v4Engine->globalObject->internalClass()->size; ++i) { if (m_v4Engine->globalObject->internalClass()->nameMap.at(i).isValid()) { QV4::Identifier id = m_v4Engine->globalObject->internalClass()->nameMap.at(i); - m_illegalNames.insert(m_v4Engine->identifierTable->stringForId(id)->toQString()); + m_illegalNames.insert(id.toQString()); } } } |