diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-02-03 21:05:43 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-03-09 08:58:52 +0000 |
| commit | 1a61d609345b0222c41f93f445a6fd517a76cf48 (patch) | |
| tree | a46cd6d9e5d4dfe557d0de931c8253f43d21a0b0 /src/qml/memory | |
| parent | d7aa952e143accc18d54707d956d019272197078 (diff) | |
move locals over to be write barrier safe
Change-Id: I56b1dab62ff432273ee8549b0496bd0f3fc655ea
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/memory')
| -rw-r--r-- | src/qml/memory/qv4mm.cpp | 2 | ||||
| -rw-r--r-- | src/qml/memory/qv4mmdefs_p.h | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/qml/memory/qv4mm.cpp b/src/qml/memory/qv4mm.cpp index 39272850b4..f42d509942 100644 --- a/src/qml/memory/qv4mm.cpp +++ b/src/qml/memory/qv4mm.cpp @@ -771,7 +771,7 @@ void MemoryManager::drainMarkStack(Value *markBase) Q_ASSERT(m == Mark_ValueArray); // qDebug() << "marking Value Array at offset" << hex << (mem - reinterpret_cast<void **>(h)); ValueArray<0> *a = reinterpret_cast<ValueArray<0> *>(mem); - Value *v = a->v; + Value *v = a->values; const Value *end = v + a->alloc; while (v < end) { v->mark(engine); diff --git a/src/qml/memory/qv4mmdefs_p.h b/src/qml/memory/qv4mmdefs_p.h index 9c84a49e90..3f65e97d86 100644 --- a/src/qml/memory/qv4mmdefs_p.h +++ b/src/qml/memory/qv4mmdefs_p.h @@ -278,10 +278,6 @@ struct MarkFlagEvaluator<ValueArray<o>> { static Q_CONSTEXPR quint64 value = static_cast<quint64>(Mark_ValueArray) << (2*o / sizeof(quintptr)); }; template <size_t o> -struct MarkFlagEvaluator<HeapValueArray<o>> { - static Q_CONSTEXPR quint64 value = static_cast<quint64>(Mark_ValueArray) << (o >> 2); -}; -template <size_t o> struct MarkFlagEvaluator<HeapValue<o>> { static Q_CONSTEXPR quint64 value = static_cast<quint64>(Mark_Value) << (2 *o / sizeof(quintptr)); }; |