QtQml: Deduplicate InternalClass::addMember()

Theoretically the inner changeMember() can also produce a new
InternalClass. In that case we do have to set it.

Change-Id: I2b77e2bab9aa839e156e3293706e8d5e54518a93
Reviewed-by: Olivier De Cannière <[email protected]>

1 files changed, 4 insertions, 11 deletions

diff --git a/src/qml/jsruntime/qv4internalclass.cpp b/src/qml/jsruntime/qv4internalclass.cpp
index ff29b5c4dd..5b21d5ac07 100644
--- a/src/qml/jsruntime/qv4internalclass.cpp
+++ b/src/qml/jsruntime/qv4internalclass.cpp
@@ -565,17 +565,10 @@ InternalClass *InternalClass::locked()
 
 void InternalClass::addMember(QV4::Object *object, PropertyKey id, PropertyAttributes data, InternalClassEntry *entry)
 {
-    Q_ASSERT(id.isStringOrSymbol());
-    if (!data.isEmpty())
-        data.resolve();
-    PropertyHash::Entry *e = object->internalClass()->findEntry(id);
-    if (e) {
-        changeMember(object, id, data, entry);
-        return;
-    }
-
-    Heap::InternalClass *newClass = object->internalClass()->addMemberImpl(id, data, entry);
-    object->setInternalClass(newClass);
+    Heap::InternalClass *oldClass = object->internalClass();
+    Heap::InternalClass *newClass = oldClass->addMember(id, data, entry);
+    if (newClass != oldClass)
+        object->setInternalClass(newClass);
 }
 
 Heap::InternalClass *InternalClass::addMember(PropertyKey identifier, PropertyAttributes data, InternalClassEntry *entry)