QML: Move the ScarceResourceData from VariantObject onto the heap

So now VariantObject is nearly a trivial struct.

Change-Id: Ifc54c04d9686c03e12066c5287823dd3b1315d2a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 13 insertions, 2 deletions

diff --git a/src/qml/jsruntime/qv4variantobject_p.h b/src/qml/jsruntime/qv4variantobject_p.h
index e50706ef94..9b744faf75 100644
--- a/src/qml/jsruntime/qv4variantobject_p.h
+++ b/src/qml/jsruntime/qv4variantobject_p.h
@@ -64,16 +64,27 @@ namespace QV4 {
 
 namespace Heap {
 
-struct VariantObject : Object, public ExecutionEngine::ScarceResourceData
+struct VariantObject : Object
 {
     VariantObject();
     VariantObject(const QVariant &value);
     ~VariantObject() {
+        Q_ASSERT(scarceData);
         if (isScarce())
-            node.remove();
+            addVmePropertyReference();
+        delete scarceData;
     }
     bool isScarce() const;
     int vmePropertyReferenceCount;
+
+    const QVariant &data() const { return scarceData->data; }
+    QVariant &data() { return scarceData->data; }
+
+    void addVmePropertyReference() { scarceData->node.remove(); }
+    void removeVmePropertyReference() { internalClass->engine->scarceResources.insert(scarceData); }
+
+private:
+    ExecutionEngine::ScarceResourceData *scarceData;
 };
 
 }