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

Dumper: Fix map dumper for lldb

Browse Source 
Change-Id: I8adab131632b2ca04a3de8094699ab43d2de03bb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2022-05-05 13:56:02 +02:00
parent 9c9aa75ca3
commit d10f3f8342
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/debugger/lldbbridge.py
View File

@@ -472,6 +472,8 @@ class Dumper(DumperBase):
tdata.code = TypeCode.Void tdata.code = TypeCode.Void
elif typeName == 'wchar_t': elif typeName == 'wchar_t':
tdata.code = TypeCode.Integral tdata.code = TypeCode.Integral
elif typeName in ("char16_t", "char32_t", "char8_t"):
tdata.code = TypeCode.Integral
else: else:
self.warn('UNKNOWN TYPE KEY: %s: %s' % (typeName, code)) self.warn('UNKNOWN TYPE KEY: %s: %s' % (typeName, code))
elif code == lldb.eTypeClassEnumeration: elif code == lldb.eTypeClassEnumeration:

6
share/qtcreator/debugger/stdtypes.py
View File

@@ -643,7 +643,7 @@ def qdump__std____1__map(d, value):
with Children(d, size, maxNumChild=1000): with Children(d, size, maxNumChild=1000):
for (i, pair) in zip(d.childRange(), in_order_traversal(head)): for (i, pair) in zip(d.childRange(), in_order_traversal(head)):
d.putPairItem(i, pair, 'key', 'value') d.putPairItem(i, pair)
def qform__std____1__multimap(): def qform__std____1__multimap():
@@ -1293,9 +1293,9 @@ def qform__std____cxx11__wstring():
def qdump__std____1__basic_string(d, value): def qdump__std____1__basic_string(d, value):
innerType = value.type[0].name innerType = value.type[0].name
if innerType == "char": if innerType in ("char", "char8_t", "char16_t"):
qdump__std____1__string(d, value) qdump__std____1__string(d, value)
elif innerType == "wchar_t": elif innerType in ("wchar_t", "char32_t"):
qdump__std____1__wstring(d, value) qdump__std____1__wstring(d, value)
else: else:
d.warn("UNKNOWN INNER TYPE %s" % innerType) d.warn("UNKNOWN INNER TYPE %s" % innerType)