diff options
| author | Jeremy Ephron <jeremyephron@gmail.com> | 2020-09-29 20:12:25 -0700 |
|---|---|---|
| committer | Jeremy Barenholtz <jeremyephron@gmail.com> | 2020-10-01 10:29:12 +0000 |
| commit | b9323cccc040e3509c022bb50ad22f1d6c878380 (patch) | |
| tree | 7c2fb3d8ea62023f3f2f1166021deff487b1f62d /share/qtcreator | |
| parent | efce9b04fc200fc11114eb9ba2f4c1f8f67327d4 (diff) | |
Debugger: Use GetName instead of GetDisplayTypeName
In the newest version of LLDB, they remove anonymous and inline
namespaces from their display name, which breaks all debugger helper
code on Macs with the newest version of Xcode, since Qt Creator logic
determines libc++ vs. libstdc++ by the presence of the "__1" inline
namespace.
Change-Id: I139d0654ffbc9dec2e42b40eaad92ea2e3c067c0
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'share/qtcreator')
| -rw-r--r-- | share/qtcreator/debugger/lldbbridge.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/share/qtcreator/debugger/lldbbridge.py b/share/qtcreator/debugger/lldbbridge.py index 13ad3d3e9e..1a114704f5 100644 --- a/share/qtcreator/debugger/lldbbridge.py +++ b/share/qtcreator/debugger/lldbbridge.py @@ -546,9 +546,9 @@ class Dumper(DumperBase): return targs def typeName(self, nativeType): - if hasattr(nativeType, 'GetDisplayTypeName'): - return nativeType.GetDisplayTypeName() # Xcode 6 (lldb-320) - return nativeType.GetName() # Xcode 5 (lldb-310) + # Don't use GetDisplayTypeName since LLDB removed the inline namespace __1 + # https://reviews.llvm.org/D74478 + return nativeType.GetName() def nativeTypeId(self, nativeType): name = self.typeName(nativeType) @@ -804,7 +804,7 @@ class Dumper(DumperBase): typeobjlist = self.target.FindTypes(nonPrefixedName) if typeobjlist.IsValid(): for typeobj in typeobjlist: - n = self.canonicalTypeName(self.removeTypePrefix(typeobj.GetDisplayTypeName())) + n = self.canonicalTypeName(self.removeTypePrefix(typeobj.GetName())) if n == nonPrefixedName: #DumperBase.warn('FOUND TYPE USING FindTypes : %s' % typeobj) self.typeCache[name] = typeobj |