From 8a23c8a613b5eb360a48ee6c64ea3507caf878e2 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Sat, 10 Jan 2015 17:55:29 +0100 Subject: Move vtable out of internalClass We can move the internalClass to Object later on, and such save having the internalClass on lots of Heap objects. This commit basically adds and starts making use of a new vtable pointer in Heap::Base. In addition, the construction methods in the memory manager now automatically setup the correct vtable. Removing the vtable code from InternalClass and moving it into Object will come in a separate commit Change-Id: If49e8d73c769bf65bf47fe4dbf8b9546c8019dbc Reviewed-by: Simon Hausmann --- src/qml/jsruntime/qv4object_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/qml/jsruntime/qv4object_p.h') diff --git a/src/qml/jsruntime/qv4object_p.h b/src/qml/jsruntime/qv4object_p.h index 298779906b..939b14f4d2 100644 --- a/src/qml/jsruntime/qv4object_p.h +++ b/src/qml/jsruntime/qv4object_p.h @@ -77,7 +77,7 @@ struct Q_QML_EXPORT Object: Managed { const Property *propertyAt(uint index) const { return d()->propertyAt(index); } Property *propertyAt(uint index) { return d()->propertyAt(index); } - const ObjectVTable *vtable() const { return reinterpret_cast(internalClass()->vtable); } + const ObjectVTable *vtable() const { return reinterpret_cast(d()->vtable); } Heap::Object *prototype() const { return d()->prototype; } bool setPrototype(Object *proto); -- cgit v1.2.3