diff options
author | Lars Knoll <lars.knoll@digia.com> | 2014-03-31 15:48:02 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-04 17:26:20 +0200 |
commit | 8e556778c8324c61ddf5842e457c873c1b5aac02 (patch) | |
tree | ca9dd1cd85510fdbd01221005cb0c096a844a762 /src/qml/jsruntime/qv4lookup.cpp | |
parent | b02eeeee586abe343b8866385c1327ac009b3ef0 (diff) |
Garbage collect member data
Move the allocated member data into the garbage collected
area, so that we can avoid using malloc/free for it.
Change-Id: I20625efa67ecd60238568742b74854b0c8cb2e3e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4lookup.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4lookup.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4lookup.cpp b/src/qml/jsruntime/qv4lookup.cpp index 875a02732f..1155bbf9e9 100644 --- a/src/qml/jsruntime/qv4lookup.cpp +++ b/src/qml/jsruntime/qv4lookup.cpp @@ -763,7 +763,7 @@ void Lookup::setterInsert0(Lookup *l, const ValueRef object, const ValueRef valu Object *o = static_cast<Object *>(object->asManaged()); if (o && o->internalClass == l->classList[0]) { if (!o->prototype()) { - if (l->index >= o->memberDataAlloc) + if (l->index >= o->memberData.size()) o->ensureMemberIndex(l->index); o->memberData[l->index] = *value; o->internalClass = l->classList[3]; @@ -781,7 +781,7 @@ void Lookup::setterInsert1(Lookup *l, const ValueRef object, const ValueRef valu if (o && o->internalClass == l->classList[0]) { Object *p = o->prototype(); if (p && p->internalClass == l->classList[1]) { - if (l->index >= o->memberDataAlloc) + if (l->index >= o->memberData.size()) o->ensureMemberIndex(l->index); o->memberData[l->index] = *value; o->internalClass = l->classList[3]; @@ -801,7 +801,7 @@ void Lookup::setterInsert2(Lookup *l, const ValueRef object, const ValueRef valu if (p && p->internalClass == l->classList[1]) { p = p->prototype(); if (p && p->internalClass == l->classList[2]) { - if (l->index >= o->memberDataAlloc) + if (l->index >= o->memberData.size()) o->ensureMemberIndex(l->index); o->memberData[l->index] = *value; o->internalClass = l->classList[3]; |