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

Cdb: Fix QList child dumper

Browse Source 
Task-number: QTCREATORBUG-16750
Change-Id: If67e2a55bb0a67957b10069675cdd0df7a18ad10
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2016-08-22 12:49:46 +02:00
parent 5908d9aa14
commit 9ce19c5dac
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/libs/qtcreatorcdbext/containers.cpp
View File

@@ -758,14 +758,8 @@ static inline AbstractSymbolGroupNodePtrVector
AddressSequence(arrayAddress, pointerSize), AddressSequence(arrayAddress, pointerSize),
v.module(), innerType, count); v.module(), innerType, count);
// Check condition for large||static. // Check condition for large||static.
bool isLargeOrStatic = innerTypeSize > pointerSize; const bool isLargeOrStatic = innerTypeSize > pointerSize
if (!isLargeOrStatic && !SymbolGroupValue::isPointerType(innerType)) { || !SymbolGroupValue::isMovable(innerType, v);
const KnownType kt = knownType(innerType, false); // inner type, no 'class ' prefix.
if (kt != KT_Unknown && !(kt & (KT_POD_Type|KT_Qt_PrimitiveType|KT_Qt_MovableType))
&& !(kt == KT_QStringList && QtInfo::get(v.context()).version >= 5)) {
isLargeOrStatic = true;
}
}
if (SymbolGroupValue::verbose) if (SymbolGroupValue::verbose)
DebugPrint() << "isLargeOrStatic " << isLargeOrStatic; DebugPrint() << "isLargeOrStatic " << isLargeOrStatic;
if (isLargeOrStatic) { if (isLargeOrStatic) {
@@ -776,7 +770,8 @@ static inline AbstractSymbolGroupNodePtrVector
arrayChildList(v.node()->symbolGroup(), arrayChildList(v.node()->symbolGroup(),
AddressArraySequence<ULONG64>(reinterpret_cast<const ULONG64 *>(data)), AddressArraySequence<ULONG64>(reinterpret_cast<const ULONG64 *>(data)),
v.module(), innerType, count) : v.module(), innerType, count) :
arrayChildList(v.node()->symbolGroup(), AddressArraySequence<ULONG32>(reinterpret_cast<const ULONG32 *>(data)), arrayChildList(v.node()->symbolGroup(),
AddressArraySequence<ULONG32>(reinterpret_cast<const ULONG32 *>(data)),
v.module(), innerType, count); v.module(), innerType, count);
delete [] data; delete [] data;
return rc; return rc;

8
src/libs/qtcreatorcdbext/symbolgroupvalue.cpp
View File

@@ -1505,6 +1505,14 @@ void formatKnownTypeFlags(std::ostream &os, KnownType kt)
os << " simple_dumper"; os << " simple_dumper";
} }
unsigned SymbolGroupValue::isMovable(const std::string &t, const SymbolGroupValue &v)
{
KnownType kt = knownType(t, false);
if (kt & (KT_POD_Type | KT_Qt_MovableType | KT_Qt_PrimitiveType))
return true;
return kt == KT_QStringList && QtInfo::get(v.context()).version >= 5;
}
static inline DumpParameterRecodeResult static inline DumpParameterRecodeResult
checkCharArrayRecode(const SymbolGroupValue &v) checkCharArrayRecode(const SymbolGroupValue &v)
{ {

1
src/libs/qtcreatorcdbext/symbolgroupvalue.h
View File

@@ -112,6 +112,7 @@ public:
static std::string moduleOfType(const std::string &type); static std::string moduleOfType(const std::string &type);
// pointer type, return number of characters to strip // pointer type, return number of characters to strip
static unsigned isPointerType(const std::string &); static unsigned isPointerType(const std::string &);
static unsigned isMovable(const std::string &, const SymbolGroupValue &v);
static bool isArrayType(const std::string &); static bool isArrayType(const std::string &);
static bool isVTableType(const std::string &t); static bool isVTableType(const std::string &t);
// add pointer type 'Foo' -> 'Foo *', 'Foo *' -> 'Foo **' // add pointer type 'Foo' -> 'Foo *', 'Foo *' -> 'Foo **'