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

Debugger: Fix type lookup for pointers

Browse Source 
Change-Id: Ie89a120cafd6755f1e2f61f15eb39fd64f0494d5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2016-10-11 14:29:10 +02:00
parent eed064c7ed
commit a07e9450e8
2 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/libs/qtcreatorcdbext/pytype.cpp
View File

@@ -53,11 +53,30 @@ PyObject *lookupType(const std::string &typeNameIn)
{ {
std::string typeName = typeNameIn; std::string typeName = typeNameIn;
CIDebugSymbols *symbols = ExtensionCommandContext::instance()->symbols(); CIDebugSymbols *symbols = ExtensionCommandContext::instance()->symbols();
std::string fullTypeName = typeName;
// GetSymbolTypeId doesn't support pointer types so we need to strip off the '*' first
while (endsWith(typeName, '*'))
typeName.pop_back();
ULONG64 module; ULONG64 module;
ULONG typeId; ULONG typeId;
if (FAILED(symbols->GetSymbolTypeId(typeName.c_str(), &typeId, &module))) if (FAILED(symbols->GetSymbolTypeId(typeName.c_str(), &typeId, &module)))
Py_RETURN_NONE; Py_RETURN_NONE;
return createType(module, typeId); if (typeName != fullTypeName) {
if (module == 0) { // found some builtin type like char so we take the first module available to look up the pointer type
ULONG loaded, unloaded;
if (FAILED(symbols->GetNumberModules(&loaded, &unloaded)))
Py_RETURN_NONE;
if ((loaded + unloaded == 0) || FAILED(symbols->GetModuleByIndex(0, &module)))
Py_RETURN_NONE;
}
if (FAILED(symbols->GetTypeId(module, fullTypeName.c_str(), &typeId)))
Py_RETURN_NONE;
}
size_t typeNameLength = fullTypeName.length();
char *cTypeName = new char[typeNameLength + 1];
fullTypeName.copy(cTypeName, fullTypeName.length());
cTypeName[typeNameLength] = 0;
return createType(module, typeId, cTypeName);
} }
char *getTypeName(ULONG64 module, ULONG typeId) char *getTypeName(ULONG64 module, ULONG typeId)
@@ -143,13 +162,8 @@ PyObject *type_Target(Type *self)
Py_XINCREF(self); Py_XINCREF(self);
return (PyObject *)self; return (PyObject *)self;
} }
typeName = typeName.substr(0, typeName.length() - 1); typeName.pop_back();
return lookupType(typeName);
CIDebugSymbols *symbols = ExtensionCommandContext::instance()->symbols();
ULONG typeId;
if (FAILED(symbols->GetTypeId(self->m_module, typeName.c_str(), &typeId)))
return NULL;
return createType(self->m_module, typeId);
} }
PyObject *type_StripTypedef(Type *self) PyObject *type_StripTypedef(Type *self)
@@ -270,12 +284,12 @@ void type_Dealloc(Type *self)
delete[] self->m_name; delete[] self->m_name;
} }
PyObject *createType(ULONG64 module, ULONG typeId) PyObject *createType(ULONG64 module, ULONG typeId, char* name)
{ {
Type *type = PyObject_New(Type, type_pytype()); Type *type = PyObject_New(Type, type_pytype());
type->m_module = module; type->m_module = module;
type->m_typeId = typeId; type->m_typeId = typeId;
type->m_name = nullptr; type->m_name = name;
return reinterpret_cast<PyObject *>(type); return reinterpret_cast<PyObject *>(type);
} }

2
src/libs/qtcreatorcdbext/pytype.h
View File

@@ -44,4 +44,4 @@ PyTypeObject *type_pytype();
char *getTypeName(ULONG64 module, ULONG typeId); char *getTypeName(ULONG64 module, ULONG typeId);
PyObject *lookupType(const std::string &typeName); PyObject *lookupType(const std::string &typeName);
PyObject *createType(ULONG64 module, ULONG typeId); PyObject *createType(ULONG64 module, ULONG typeId, char *name = nullptr);