Move Managed::type and some flags into the vtable

Move the type flag into the vtable to free up these
bits in the Managed class, and not have to set them
at object construction time.

As we often need to know whether a Managed object is a
Object, FunctionObject or String, add some bitflags to test
for these to the vtable.

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

1 files changed, 9 insertions, 4 deletions

diff --git a/src/qml/jsruntime/qv4string.cpp b/src/qml/jsruntime/qv4string.cpp
index e5633eb06f..0b38b5c08b 100644
--- a/src/qml/jsruntime/qv4string.cpp
+++ b/src/qml/jsruntime/qv4string.cpp
@@ -103,6 +103,13 @@ static uint toArrayIndex(const char *ch, const char *end, bool *ok)
 
 const ManagedVTable String::static_vtbl =
 {
+    String::IsExecutionContext,
+    String::IsString,
+    String::IsObject,
+    String::IsFunctionObject,
+    String::IsErrorObject,
+    0,
+    String::MyType,
     call,
     construct,
     markObjects,
@@ -233,10 +240,10 @@ bool String::isEqualTo(Managed *t, Managed *o)
     if (t == o)
         return true;
 
-    if (o->type != Type_String)
+    if (o->internalClass->vtable->type != Type_String)
         return false;
 
-    Q_ASSERT(t->type == Type_String);
+    Q_ASSERT(t->internalClass->vtable->type == Type_String);
     String *that = static_cast<String *>(t);
     String *other = static_cast<String *>(o);
     if (that->hashValue() != other->hashValue())
@@ -257,7 +264,6 @@ String::String(ExecutionEngine *engine, const QString &text)
 {
     _text->ref.ref();
     len = _text->size;
-    type = Type_String;
     subtype = StringType_Unknown;
 }
 
@@ -267,7 +273,6 @@ String::String(ExecutionEngine *engine, String *l, String *r)
     , stringHash(UINT_MAX), largestSubLength(qMax(l->largestSubLength, r->largestSubLength))
     , len(l->len + r->len)
 {
-    type = Type_String;
     subtype = StringType_Unknown;
 
     if (!l->largestSubLength && l->len > largestSubLength)