From b11ec085703a0b019c8115ff505ee6e2553fd4f1 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@digia.com>
Date: Sat, 5 Apr 2014 20:23:20 +0200
Subject: Move Managed data into it's own subclass

This prepares for moving over to a d pointer scheme,
where Managed subclasses don't hold any data directly. This
is required to be able to move over to a modern GC.

Change-Id: I3f59633ac07a7da461bd2d4f0f9f3a8e3b0baf02
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---
 src/qml/jsruntime/qv4internalclass.cpp | 38 +++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'src/qml/jsruntime/qv4internalclass.cpp')

diff --git a/src/qml/jsruntime/qv4internalclass.cpp b/src/qml/jsruntime/qv4internalclass.cpp
index 3dc20b8e76..cb8841e681 100644
--- a/src/qml/jsruntime/qv4internalclass.cpp
+++ b/src/qml/jsruntime/qv4internalclass.cpp
@@ -155,18 +155,18 @@ InternalClass::InternalClass(const QV4::InternalClass &other)
 void InternalClass::changeMember(Object *object, String *string, PropertyAttributes data, uint *index)
 {
     uint idx;
-    InternalClass *newClass = object->internalClass->changeMember(string, data, &idx);
+    InternalClass *newClass = object->internalClass()->changeMember(string, data, &idx);
     if (index)
         *index = idx;
 
-    if (newClass->size > object->internalClass->size) {
-        Q_ASSERT(newClass->size == object->internalClass->size + 1);
-        memmove(object->memberData.data() + idx + 2, object->memberData.data() + idx + 1, (object->internalClass->size - idx - 1)*sizeof(Value));
-    } else if (newClass->size < object->internalClass->size) {
-        Q_ASSERT(newClass->size == object->internalClass->size - 1);
-        memmove(object->memberData.data() + idx + 1, object->memberData.data() + idx + 2, (object->internalClass->size - idx - 2)*sizeof(Value));
+    if (newClass->size > object->internalClass()->size) {
+        Q_ASSERT(newClass->size == object->internalClass()->size + 1);
+        memmove(object->memberData.data() + idx + 2, object->memberData.data() + idx + 1, (object->internalClass()->size - idx - 1)*sizeof(Value));
+    } else if (newClass->size < object->internalClass()->size) {
+        Q_ASSERT(newClass->size == object->internalClass()->size - 1);
+        memmove(object->memberData.data() + idx + 1, object->memberData.data() + idx + 2, (object->internalClass()->size - idx - 2)*sizeof(Value));
     }
-    object->internalClass = newClass;
+    object->setInternalClass(newClass);
 }
 
 InternalClass *InternalClass::changeMember(String *string, PropertyAttributes data, uint *index)
@@ -279,18 +279,18 @@ void InternalClass::addMember(Object *object, StringRef string, PropertyAttribut
 void InternalClass::addMember(Object *object, String *string, PropertyAttributes data, uint *index)
 {
     data.resolve();
-    object->internalClass->engine->identifierTable->identifier(string);
-    if (object->internalClass->propertyTable.lookup(string->identifier) < object->internalClass->size) {
+    object->internalClass()->engine->identifierTable->identifier(string);
+    if (object->internalClass()->propertyTable.lookup(string->identifier) < object->internalClass()->size) {
         changeMember(object, string, data, index);
         return;
     }
 
     uint idx;
-    InternalClass *newClass = object->internalClass->addMemberImpl(string, data, &idx);
+    InternalClass *newClass = object->internalClass()->addMemberImpl(string, data, &idx);
     if (index)
         *index = idx;
 
-    object->internalClass = newClass;
+    object->setInternalClass(newClass);
 }
 
 
@@ -346,15 +346,15 @@ InternalClass *InternalClass::addMemberImpl(String *string, PropertyAttributes d
 
 void InternalClass::removeMember(Object *object, Identifier *id)
 {
-    InternalClass *oldClass = object->internalClass;
+    InternalClass *oldClass = object->internalClass();
     uint propIdx = oldClass->propertyTable.lookup(id);
     Q_ASSERT(propIdx < oldClass->size);
 
     Transition t = { { id } , -1 };
-    QHash<Transition, InternalClass *>::const_iterator tit = object->internalClass->transitions.constFind(t);
+    QHash<Transition, InternalClass *>::const_iterator tit = object->internalClass()->transitions.constFind(t);
 
-    if (tit != object->internalClass->transitions.constEnd()) {
-        object->internalClass = tit.value();
+    if (tit != object->internalClass()->transitions.constEnd()) {
+        object->setInternalClass(tit.value());
     } else {
         // create a new class and add it to the tree
         InternalClass *newClass = oldClass->engine->emptyClass->changeVTable(oldClass->vtable);
@@ -365,13 +365,13 @@ void InternalClass::removeMember(Object *object, Identifier *id)
             if (!oldClass->propertyData.at(i).isEmpty())
                 newClass = newClass->addMember(oldClass->nameMap.at(i), oldClass->propertyData.at(i));
         }
-        object->internalClass = newClass;
+        object->setInternalClass(newClass);
     }
 
     // remove the entry in memberdata
-    memmove(object->memberData.data() + propIdx, object->memberData.data() + propIdx + 1, (object->internalClass->size - propIdx)*sizeof(Value));
+    memmove(object->memberData.data() + propIdx, object->memberData.data() + propIdx + 1, (object->internalClass()->size - propIdx)*sizeof(Value));
 
-    oldClass->transitions.insert(t, object->internalClass);
+    oldClass->transitions.insert(t, object->internalClass());
 }
 
 uint InternalClass::find(const StringRef string)
-- 
cgit v1.2.3