Move prototype pointer into QV4::InternalClass

The prototype is actually the same for most objects. By
moving it into the internal class, we can save 8 bytes
per object, as well as allowing for some future
optimizations.

Also fix a bug in the implementation of the Error
prototype objects.

Change-Id: I4d4b641055f644a9b088f27be34bfdb0446279b7
Reviewed-by: Simon Hausmann <[email protected]>

1 files changed, 11 insertions, 4 deletions

diff --git a/src/qml/jsruntime/qv4variantobject.cpp b/src/qml/jsruntime/qv4variantobject.cpp
index f18c5b582e..1989e3dcf5 100644
--- a/src/qml/jsruntime/qv4variantobject.cpp
+++ b/src/qml/jsruntime/qv4variantobject.cpp
@@ -51,13 +51,21 @@ using namespace QV4;
 
 DEFINE_MANAGED_VTABLE(VariantObject);
 
+VariantObject::VariantObject(InternalClass *ic)
+    : Object(ic)
+    , ExecutionEngine::ScarceResourceData(QVariant())
+    , m_vmePropertyReferenceCount(0)
+{
+    vtbl = &static_vtbl;
+}
+
 VariantObject::VariantObject(ExecutionEngine *engine, const QVariant &value)
     : Object(engine)
     , ExecutionEngine::ScarceResourceData(value)
     , m_vmePropertyReferenceCount(0)
 {
     vtbl = &static_vtbl;
-    prototype = engine->variantPrototype;
+    setPrototype(engine->variantPrototype);
     if (isScarce())
         internalClass->engine->scarceResources.insert(this);
 }
@@ -132,10 +140,9 @@ void VariantObject::removeVmePropertyReference()
 }
 
 
-VariantPrototype::VariantPrototype(ExecutionEngine *engine)
-    : VariantObject(engine, QVariant())
+VariantPrototype::VariantPrototype(InternalClass *ic)
+    : VariantObject(ic)
 {
-    prototype = engine->objectPrototype;
 }
 
 void VariantPrototype::init(ExecutionEngine *engine)