Move prototype back from the vtable into Object

This is the only way we can support a GC that moves
objects around in memory.

Change-Id: I1d168fae4aa9f575b730e469e762bc5b5549b886
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 24 insertions, 4 deletions

diff --git a/src/qml/jsruntime/qv4engine_p.h b/src/qml/jsruntime/qv4engine_p.h
index ad9fde3d86..dc75d37a86 100644
--- a/src/qml/jsruntime/qv4engine_p.h
+++ b/src/qml/jsruntime/qv4engine_p.h
@@ -141,16 +141,36 @@ public:
     Value syntaxErrorCtor;
     Value typeErrorCtor;
     Value uRIErrorCtor;
-    Value sequencePrototype;
     Value arrayBufferCtor;
     Value dataViewCtor;
     enum { NTypedArrayTypes = 9 }; // avoid header dependency
     Value typedArrayCtors[NTypedArrayTypes];
 
+    Value objectPrototype;
+    Value arrayPrototype;
+    Value stringPrototype;
+    Value numberPrototype;
+    Value booleanPrototype;
+    Value datePrototype;
+    Value functionPrototype;
+    Value regExpPrototype;
+    Value errorPrototype;
+    Value evalErrorPrototype;
+    Value rangeErrorPrototype;
+    Value referenceErrorPrototype;
+    Value syntaxErrorPrototype;
+    Value typeErrorPrototype;
+    Value uRIErrorPrototype;
+    Value variantPrototype;
+    Value sequencePrototype;
+
+    Value arrayBufferPrototype;
+    Value dataViewPrototype;
+    Value typedArrayPrototype[NTypedArrayTypes]; // TypedArray::NValues, avoid including the header here
+
     InternalClassPool *classPool;
     InternalClass *emptyClass;
     InternalClass *executionContextClass;
-    InternalClass *constructClass;
     InternalClass *stringClass;
 
     InternalClass *objectClass;
@@ -264,7 +284,7 @@ public:
     ExecutionContext *popContext();
 
     Heap::Object *newObject();
-    Heap::Object *newObject(InternalClass *internalClass);
+    Heap::Object *newObject(InternalClass *internalClass, Object *prototype);
 
     Heap::String *newString(const QString &s);
     Heap::String *newIdentifier(const QString &text);
@@ -275,7 +295,7 @@ public:
 
     Heap::ArrayObject *newArrayObject(int count = 0);
     Heap::ArrayObject *newArrayObject(const QStringList &list);
-    Heap::ArrayObject *newArrayObject(InternalClass *ic);
+    Heap::ArrayObject *newArrayObject(InternalClass *ic, Object *prototype);
 
     Heap::DateObject *newDateObject(const ValueRef value);
     Heap::DateObject *newDateObject(const QDateTime &dt);