diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-09-10 23:30:04 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-09-16 17:00:22 +0000 |
| commit | e436fb3569603bca8ad0a71fef67c03d2920aedc (patch) | |
| tree | a8076925a788fd721c8b46119f0f13009ca882e8 /src/qml/jsruntime/qv4memberdata.cpp | |
| parent | 6982d0d6290c137468749bb8ab2f2e20dfa453fd (diff) | |
Store InternalClass::nameMap in a MemberData
This helps make that memory known to the GC as well, and makes
marking of internal classes much more efficient, as we don't
mark the property keys repeatedly (even if they are shared
between different internal classes)
Change-Id: Ibb7e5383672d7657926bd08bf13f73f7680a9f31
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4memberdata.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4memberdata.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4memberdata.cpp b/src/qml/jsruntime/qv4memberdata.cpp index da086bd47a..246f857643 100644 --- a/src/qml/jsruntime/qv4memberdata.cpp +++ b/src/qml/jsruntime/qv4memberdata.cpp @@ -62,8 +62,9 @@ static size_t nextPowerOfTwo(size_t s) Heap::MemberData *MemberData::allocate(ExecutionEngine *e, uint n, Heap::MemberData *old) { - Q_ASSERT(!old || old->values.size < n); - Q_ASSERT(n); + Q_ASSERT(!old || old->values.size <= n); + if (!n) + n = 4; size_t alloc = MemoryManager::align(sizeof(Heap::MemberData) + (n - 1)*sizeof(Value)); // round up to next power of two to avoid quadratic behaviour for very large objects |