From d10f3f834213d165381a849779829685343e78ef Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 5 May 2022 13:56:02 +0200 Subject: [PATCH] Dumper: Fix map dumper for lldb Change-Id: I8adab131632b2ca04a3de8094699ab43d2de03bb Reviewed-by: Reviewed-by: hjk --- share/qtcreator/debugger/lldbbridge.py | 2 ++ share/qtcreator/debugger/stdtypes.py | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/share/qtcreator/debugger/lldbbridge.py b/share/qtcreator/debugger/lldbbridge.py index 7bba95dd394..e121ece7da5 100644 --- a/share/qtcreator/debugger/lldbbridge.py +++ b/share/qtcreator/debugger/lldbbridge.py @@ -472,6 +472,8 @@ class Dumper(DumperBase): tdata.code = TypeCode.Void elif typeName == 'wchar_t': tdata.code = TypeCode.Integral + elif typeName in ("char16_t", "char32_t", "char8_t"): + tdata.code = TypeCode.Integral else: self.warn('UNKNOWN TYPE KEY: %s: %s' % (typeName, code)) elif code == lldb.eTypeClassEnumeration: diff --git a/share/qtcreator/debugger/stdtypes.py b/share/qtcreator/debugger/stdtypes.py index 0bc5c1e5ffe..1f4386607d7 100644 --- a/share/qtcreator/debugger/stdtypes.py +++ b/share/qtcreator/debugger/stdtypes.py @@ -643,7 +643,7 @@ def qdump__std____1__map(d, value): with Children(d, size, maxNumChild=1000): 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(): @@ -1293,9 +1293,9 @@ def qform__std____cxx11__wstring(): def qdump__std____1__basic_string(d, value): innerType = value.type[0].name - if innerType == "char": + if innerType in ("char", "char8_t", "char16_t"): qdump__std____1__string(d, value) - elif innerType == "wchar_t": + elif innerType in ("wchar_t", "char32_t"): qdump__std____1__wstring(d, value) else: d.warn("UNKNOWN INNER TYPE %s" % innerType)