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

Debugger: disable load qml stack action for cdb

Browse Source 
Since collecting the qml stack relies on calling functions it has a high
risk of getting stuck in that call at least with Qt 5.15. Never the less
I added the correct function in the cdbextension so when the action
get's re-enabled in the future we already start with an updated
extension.

Task-number: QTCREATORBUG-22209
Change-Id: I535f8db5a64ae48b4163d9b67e133cc3de338432
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2020-07-09 11:19:57 +02:00
parent cda204aa34
commit 8541650096
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp
View File

@@ -1250,7 +1250,7 @@ extern "C" HRESULT CALLBACK qmlstack(CIDebugClient *client, PCSTR argsIn)
// the start assuming this is invoked for crashed applications. // the start assuming this is invoked for crashed applications.
std::ostringstream callStr; std::ostringstream callStr;
const QtInfo &qtInfo = QtInfo::get(SymbolGroupValueContext(exc.dataSpaces(), exc.symbols())); const QtInfo &qtInfo = QtInfo::get(SymbolGroupValueContext(exc.dataSpaces(), exc.symbols()));
callStr << qtInfo.prependQtModule("qt_v4StackTrace(", QtInfo::Qml) << std::showbase << std::hex callStr << qtInfo.prependQtModule("qt_v4StackTraceForEngine(", QtInfo::Qml) << std::showbase << std::hex
<< jsExecutionEngine << std::dec << std::noshowbase << ')'; << jsExecutionEngine << std::dec << std::noshowbase << ')';
std::wstring wOutput; std::wstring wOutput;
if (!ExtensionContext::instance().call(callStr.str(), ExtensionContext::CallWithExceptionsHandled, &wOutput, &errorMessage)) if (!ExtensionContext::instance().call(callStr.str(), ExtensionContext::CallWithExceptionsHandled, &wOutput, &errorMessage))

3
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -730,8 +730,7 @@ bool CdbEngine::hasCapability(unsigned cap) const
| CreateFullBacktraceCapability | CreateFullBacktraceCapability
| OperateByInstructionCapability | OperateByInstructionCapability
| RunToLineCapability | RunToLineCapability
| MemoryAddressCapability | MemoryAddressCapability);
| AdditionalQmlStackCapability);
} }
void CdbEngine::executeStepIn(bool byInstruction) void CdbEngine::executeStepIn(bool byInstruction)