diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-05-02 12:15:49 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-05-02 19:22:31 +0000 |
| commit | f7656d06c0d2095a8d8dd3b930e48dc98996634f (patch) | |
| tree | 27eecd7116ab814c4929ac658dcbb7d1a46d22f6 /src/qml/memory/qv4mm_p.h | |
| parent | c3e1e6390edbc28e6e528f401eb4f3639661302b (diff) | |
Correctly set the black bit for stack allocated contexts
Set the bit if Qt is configured with -force-asserts, so that
the asserts won't trigger wrongly.
Task-number: QTBUG-60487
Change-Id: Id256748c74d38ba897c38f448a814a240d978694
Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
Reviewed-by: Michael Brasser <michael.brasser@live.com>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/memory/qv4mm_p.h')
| -rw-r--r-- | src/qml/memory/qv4mm_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/memory/qv4mm_p.h b/src/qml/memory/qv4mm_p.h index 07e428b9bc..df7d09dce0 100644 --- a/src/qml/memory/qv4mm_p.h +++ b/src/qml/memory/qv4mm_p.h @@ -86,7 +86,7 @@ struct StackAllocator { } else { nextFree += requiredSlots; } -#if MM_DEBUG || !defined(QT_NO_DEBUG) +#if MM_DEBUG || !defined(QT_NO_DEBUG) || defined(QT_FORCE_ASSERTS) Chunk *c = m->chunk(); Chunk::setBit(c->objectBitmap, m - c->realBase()); #endif @@ -98,7 +98,7 @@ struct StackAllocator { } else { nextFree -= requiredSlots; } -#if MM_DEBUG || !defined(QT_NO_DEBUG) +#if MM_DEBUG || !defined(QT_NO_DEBUG) || defined(QT_FORCE_ASSERTS) Chunk *c = nextFree->chunk(); Chunk::clearBit(c->objectBitmap, nextFree - c->realBase()); #endif |