diff options
Diffstat (limited to 'src/corelib/thread/qthread.cpp')
-rw-r--r-- | src/corelib/thread/qthread.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp index d067bd06d3..208420b8fe 100644 --- a/src/corelib/thread/qthread.cpp +++ b/src/corelib/thread/qthread.cpp @@ -519,7 +519,8 @@ void QtPrivate::BindingStatusOrList::setStatusAndClearList(QBindingStatus *statu QObjectPrivate::get(obj)->reinitBindingStorageAfterThreadMove(); delete pendingObjects; } - data = encodeBindingStatus(status); + // synchronizes-with the load-acquire in bindingStatus(): + data.store(encodeBindingStatus(status), std::memory_order_release); } /*! @@ -568,14 +569,13 @@ int QThread::exec() */ QBindingStatus *QtPrivate::BindingStatusOrList::addObjectUnlessAlreadyStatus(QObject *object) { - if (auto status = bindingStatus()) return status; List *objectList = list(); if (!objectList) { objectList = new List(); objectList->reserve(8); - data = encodeList(objectList); + data.store(encodeList(objectList), std::memory_order_relaxed); } objectList->push_back(object); return nullptr; @@ -583,6 +583,8 @@ QBindingStatus *QtPrivate::BindingStatusOrList::addObjectUnlessAlreadyStatus(QOb QBindingStatus *QThreadPrivate::addObjectWithPendingBindingStatusChange(QObject *obj) { + if (auto status = m_statusOrPendingObjects.bindingStatus()) + return status; QMutexLocker lock(&mutex); return m_statusOrPendingObjects.addObjectUnlessAlreadyStatus(obj); } |