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

Utils: improve assert stack printing on windows

Browse Source 
Ignore the two top level frames since those only contain the assert
infrastructure and indent the stack to make it better distinguishible
from the actual asserts.

Change-Id: I7aaa4996de5f96404bd3766310a3ae07616fb705
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2022-11-17 10:35:52 +01:00
parent 86770f28d0
commit aa6633ca21
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libs/utils/qtcassert.cpp
View File

@@ -64,7 +64,8 @@ void dumpBacktrace(int maxdepth)
frame.AddrStack.Offset = ctx.Sp;
frame.AddrFrame.Offset = ctx.Fp;
#endif
int depth = 0;
// ignore the first two frames those contain only writeAssertLocation and dumpBacktrace
int depth = -3;
static bool symbolsInitialized = false;
if (!symbolsInitialized) {
@@ -82,6 +83,8 @@ void dumpBacktrace(int maxdepth)
&SymFunctionTableAccess64,
&SymGetModuleBase64,
NULL)) {
if (++depth < 0)
continue;
char buffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME * sizeof(TCHAR)];
PSYMBOL_INFO pSymbol = (PSYMBOL_INFO)buffer;
pSymbol->SizeOfStruct = sizeof(SYMBOL_INFO);
@@ -95,7 +98,7 @@ void dumpBacktrace(int maxdepth)
IMAGEHLP_LINE64 lineInfo;
SymSetOptions(SYMOPT_LOAD_LINES);
QString out = QString("%1: 0x%2 at %3")
QString out = QString(" %1: 0x%2 at %3")
.arg(depth)
.arg(QString::number(pSymbol->Address, 16))
.arg(QString::fromLatin1(&pSymbol->Name[0], pSymbol->NameLen));
@@ -105,7 +108,7 @@ void dumpBacktrace(int maxdepth)
QString::number(lineInfo.LineNumber)));
}
qDebug().noquote() << out;
if (++depth == maxdepth)
if (depth == maxdepth)
break;
}
mutex.unlock();