forked from qt-creator/qt-creator
Fixes: debugger: move custom dumper initialization into the first
watch view update Conflicts: src/plugins/debugger/gdbengine.cpp
This commit is contained in:
@@ -3590,6 +3590,7 @@ void GdbEngine::updateLocals()
|
|||||||
setTokenBarrier();
|
setTokenBarrier();
|
||||||
|
|
||||||
m_pendingRequests = 0;
|
m_pendingRequests = 0;
|
||||||
|
|
||||||
PENDING_DEBUG("\nRESET PENDING");
|
PENDING_DEBUG("\nRESET PENDING");
|
||||||
m_toolTipCache.clear();
|
m_toolTipCache.clear();
|
||||||
m_toolTipExpression.clear();
|
m_toolTipExpression.clear();
|
||||||
@@ -3601,6 +3602,8 @@ void GdbEngine::updateLocals()
|
|||||||
sendSynchronizedCommand(cmd, StackListArguments); // stage 1/2
|
sendSynchronizedCommand(cmd, StackListArguments); // stage 1/2
|
||||||
// '2' is 'list with type and value'
|
// '2' is 'list with type and value'
|
||||||
sendSynchronizedCommand("-stack-list-locals 2", StackListLocals); // stage 2/2
|
sendSynchronizedCommand("-stack-list-locals 2", StackListLocals); // stage 2/2
|
||||||
|
|
||||||
|
tryLoadCustomDumpers();
|
||||||
}
|
}
|
||||||
|
|
||||||
void GdbEngine::handleStackListArguments(const GdbResultRecord &record)
|
void GdbEngine::handleStackListArguments(const GdbResultRecord &record)
|
||||||
@@ -3982,9 +3985,9 @@ void GdbEngine::tryLoadCustomDumpers()
|
|||||||
//if (qq->useFastStart())
|
//if (qq->useFastStart())
|
||||||
// sendCommand("set stop-on-solib-events 0");
|
// sendCommand("set stop-on-solib-events 0");
|
||||||
QString flag = QString::number(RTLD_NOW);
|
QString flag = QString::number(RTLD_NOW);
|
||||||
sendSynchronizedCommand("call (void)dlopen(\"" + lib + "\", " + flag + ")",
|
sendSyncronizedCommand("call (void)dlopen(\"" + lib + "\", " + flag + ")",
|
||||||
WatchDumpCustomSetup);
|
WatchDumpCustomSetup);
|
||||||
sendSynchronizedCommand("sharedlibrary " + dotEscape(lib));
|
sendSyncronizedCommand("sharedlibrary " + dotEscape(lib));
|
||||||
//if (qq->useFastStart())
|
//if (qq->useFastStart())
|
||||||
// sendCommand("set stop-on-solib-events 1");
|
// sendCommand("set stop-on-solib-events 1");
|
||||||
} else {
|
} else {
|
||||||
@@ -3999,9 +4002,9 @@ void GdbEngine::tryLoadCustomDumpers()
|
|||||||
// sendCommand("set stop-on-solib-events 0");
|
// sendCommand("set stop-on-solib-events 0");
|
||||||
//sendCommand("handle SIGSEGV pass stop print");
|
//sendCommand("handle SIGSEGV pass stop print");
|
||||||
//sendCommand("set unwindonsignal off");
|
//sendCommand("set unwindonsignal off");
|
||||||
sendSynchronizedCommand("call LoadLibraryA(\"" + lib + "\")",
|
sendSyncronizedCommand("call LoadLibraryA(\"" + lib + "\")",
|
||||||
WatchDumpCustomSetup);
|
WatchDumpCustomSetup);
|
||||||
sendSynchronizedCommand("sharedlibrary " + dotEscape(lib));
|
sendSyncronizedCommand("sharedlibrary " + dotEscape(lib));
|
||||||
//if (qq->useFastStart())
|
//if (qq->useFastStart())
|
||||||
// sendCommand("set stop-on-solib-events 1");
|
// sendCommand("set stop-on-solib-events 1");
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user