1 files changed, 19 insertions, 13 deletions

diff --git a/src/qml/jsruntime/qv4persistent.cpp b/src/qml/jsruntime/qv4persistent.cpp
index 88dc1946b8..4ec7103644 100644
--- a/src/qml/jsruntime/qv4persistent.cpp
+++ b/src/qml/jsruntime/qv4persistent.cpp
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 #include "qv4persistent_p.h"
-#include "qv4mm_p.h"
+#include <private/qv4mm_p.h>
 #include "qv4object_p.h"
 #include "PageAllocation.h"
 
@@ -78,11 +78,11 @@ Page *allocatePage(PersistentValueStorage *storage)
     if (p->header.next)
         p->header.next->header.prev = &p->header.next;
     for (int i = 0; i < kEntriesPerPage - 1; ++i) {
-        p->values[i].tag = QV4::Value::Empty_Type;
-        p->values[i].int_32 = i + 1;
+        p->values[i].setTag(QV4::Value::Empty_Type);
+        p->values[i].setInt_32(i + 1);
     }
-    p->values[kEntriesPerPage - 1].tag = QV4::Value::Empty_Type;
-    p->values[kEntriesPerPage - 1].int_32 = -1;
+    p->values[kEntriesPerPage - 1].setTag(QV4::Value::Empty_Type);
+    p->values[kEntriesPerPage - 1].setInt_32(-1);
 
     storage->firstPage = p;
 
@@ -97,7 +97,7 @@ PersistentValueStorage::Iterator &PersistentValueStorage::Iterator::operator++()
     while (p) {
         while (index < kEntriesPerPage - 1) {
             ++index;
-            if (static_cast<Page *>(p)->values[index].tag != QV4::Value::Empty_Type)
+            if (static_cast<Page *>(p)->values[index].tag() != QV4::Value::Empty_Type)
                 return *this;
         }
         index = -1;
@@ -147,10 +147,10 @@ Value *PersistentValueStorage::allocate()
         p = allocatePage(this);
 
     Value *v = p->values + p->header.freeList;
-    p->header.freeList = v->int_32;
+    p->header.freeList = v->int_32();
     ++p->header.refCount;
 
-    v->val = Encode::undefined();
+    v->setRawValue(Encode::undefined());
 
     return v;
 }
@@ -162,8 +162,8 @@ void PersistentValueStorage::free(Value *v)
 
     Page *p = getPage(v);
 
-    v->tag = QV4::Value::Empty_Type;
-    v->int_32 = p->header.freeList;
+    v->setTag(QV4::Value::Empty_Type);
+    v->setInt_32(p->header.freeList);
     p->header.freeList = v - p->values;
     if (!--p->header.refCount) {
         if (p->header.prev)
@@ -178,8 +178,8 @@ static void drainMarkStack(QV4::ExecutionEngine *engine, Value *markBase)
 {
     while (engine->jsStackTop > markBase) {
         Heap::Base *h = engine->popForGC();
-        Q_ASSERT (h->gcGetVtable()->markObjects);
-        h->gcGetVtable()->markObjects(h, engine);
+        Q_ASSERT (h->vtable()->markObjects);
+        h->vtable()->markObjects(h, engine);
     }
 }
 
@@ -190,7 +190,7 @@ void PersistentValueStorage::mark(ExecutionEngine *e)
     Page *p = static_cast<Page *>(firstPage);
     while (p) {
         for (int i = 0; i < kEntriesPerPage; ++i) {
-            if (Managed *m = p->values[i].asManaged())
+            if (Managed *m = p->values[i].as<Managed>())
                 m->mark(e);
         }
         drainMarkStack(e, markBase);
@@ -312,6 +312,12 @@ WeakValue::WeakValue(const WeakValue &other)
     }
 }
 
+WeakValue::WeakValue(ExecutionEngine *engine, const Value &value)
+{
+    val = engine->memoryManager->m_weakValues->allocate();
+    *val = value;
+}
+
 WeakValue &WeakValue::operator=(const WeakValue &other)
 {
     if (!val) {