feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TaskTree: Detect a misconfigured recipe of a nested task tree

Browse Source 
Change-Id: I6652336023ac111cde5334e655f5dd972977b07f
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2024-06-12 15:42:07 +02:00
parent 55836c174d
commit e331329e4f
2 changed files with 64 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/libs/solutions/tasking/tasktree.cpp
View File

@@ -1291,6 +1291,12 @@ const void *Loop::valuePtr() const
using StoragePtr = void *;
static QString s_activeStorageWarning =
"The referenced storage is not reachable in the running tree. "
"A nullptr will be returned which might lead to a crash in the calling code. "
"It is possible that no storage was added to the tree, "
"or the storage is not reachable from where it is referenced.";
class StorageThreadData
{
Q_DISABLE_COPY_MOVE(StorageThreadData)
@@ -1299,7 +1305,7 @@ public:
StorageThreadData() = default;
void pushStorage(StoragePtr storagePtr)
{
m_activeStorageStack.push_back(storagePtr);
m_activeStorageStack.push_back({storagePtr, activeTaskTree()});
}
void popStorage()
{
@@ -1308,16 +1314,16 @@ public:
}
StoragePtr activeStorage() const
{
QT_ASSERT(m_activeStorageStack.size(), qWarning(
"The referenced storage is not reachable in the running tree. "
"A nullptr will be returned which might lead to a crash in the calling code. "
"It is possible that no storage was added to the tree, "
"or the storage is not reachable from where it is referenced."); return nullptr);
return m_activeStorageStack.last();
QT_ASSERT(m_activeStorageStack.size(),
qWarning().noquote() << s_activeStorageWarning; return nullptr);
const QPair<StoragePtr, TaskTree *> &top = m_activeStorageStack.last();
QT_ASSERT(top.second == activeTaskTree(),
qWarning().noquote() << s_activeStorageWarning; return nullptr);
return top.first;
}
private:
QList<StoragePtr> m_activeStorageStack;
QList<QPair<StoragePtr, TaskTree *>> m_activeStorageStack;
};
class StorageData