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

ProjectExplorer: Add some soft asserts in toolchain factory functions

Browse Source 
These might help with diagnosing mysterious crashes observed on user
machines.

Task-number: QTCREATORBUG-32127
Change-Id: Ia41cb4bd1f68717cec255a131d02c3b86f87b769
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Christian Kandeler
2024-12-09 12:48:42 +01:00
parent 0cae52c16c
commit 746fd23e99
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/projectexplorer/toolchain.cpp
View File

@@ -187,7 +187,9 @@ QString Toolchain::detectionSource() const
ToolchainFactory *Toolchain::factory() const ToolchainFactory *Toolchain::factory() const
{ {
return ToolchainFactory::factoryForType(typeId()); ToolchainFactory * const factory = ToolchainFactory::factoryForType(typeId());
QTC_ASSERT(factory, qDebug() << typeId());
return factory;
} }
QByteArray Toolchain::id() const QByteArray Toolchain::id() const
@@ -741,12 +743,11 @@ void ToolchainFactory::autoDetectionToMap(Store &data, bool detected)
Toolchain *ToolchainFactory::createToolchain(Id toolchainType) Toolchain *ToolchainFactory::createToolchain(Id toolchainType)
{ {
for (ToolchainFactory *factory : std::as_const(toolchainFactories())) { if (ToolchainFactory * const factory = factoryForType(toolchainType)) {
if (factory->m_supportedToolchainType == toolchainType) { if (Toolchain * const tc = factory->create()) {
if (Toolchain *tc = factory->create()) { QTC_ASSERT(tc->typeId() == toolchainType, qDebug() << toolchainType.toSetting());
tc->d->m_typeId = toolchainType; tc->d->m_typeId = toolchainType; // FIXME: Redundant?
return tc; return tc;
}
} }
} }
return nullptr; return nullptr;