RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 02:33:06 +01:00
Code Issues Projects Releases Wiki Activity

Avoid fragile type lookups in GDB pretty printer

Browse Source 
Instead of using the type llvm::StringMapEntry<{stringified_value_type}>
use only the base class llvm::StringMapEntryBase and calculate the
offsets of the member variables manually. The approach with stringifying
the name of the value type is pretty fragile as it can easily break with
local and dependent types.

Differential Revision: https://reviews.llvm.org/D94431
This commit is contained in:
Moritz Sichert 2021-01-11 15:55:20 +01:00
parent 962b770084
commit 64b62b62ba
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
utils/gdb-scripts/prettyprinters.py
View File

@ -211,7 +211,7 @@ class StringMapPrinter:
it = self.val['TheTable'] it = self.val['TheTable']
end = (it + self.val['NumBuckets']) end = (it + self.val['NumBuckets'])
value_ty = self.val.type.template_argument(0) value_ty = self.val.type.template_argument(0)
entry_ty = gdb.lookup_type('llvm::StringMapEntry<{}>'.format(value_ty.name)) entry_base_ty = gdb.lookup_type('llvm::StringMapEntryBase')
tombstone = gdb.parse_and_eval('llvm::StringMapImpl::TombstoneIntVal'); tombstone = gdb.parse_and_eval('llvm::StringMapImpl::TombstoneIntVal');
while it != end: while it != end:
@ -220,15 +220,17 @@ class StringMapPrinter:
it = it + 1 it = it + 1
continue continue
entry_ptr = it_deref.cast(entry_ty.pointer()) entry_ptr = it_deref.cast(entry_base_ty.pointer())
entry = entry_ptr.dereference() entry = entry_ptr.dereference()
str_len = entry['keyLength'] str_len = entry['keyLength']
str_data = (entry_ptr + 1).cast(gdb.lookup_type('char').const().pointer()) value_ptr = (entry_ptr + 1).cast(value_ty.pointer())
str_data = (entry_ptr + 1).cast(gdb.lookup_type('uintptr_t')) + max(value_ty.sizeof, entry_base_ty.alignof)
str_data = str_data.cast(gdb.lookup_type('char').const().pointer())
string_ref = gdb.Value(struct.pack('PN', int(str_data), int(str_len)), gdb.lookup_type('llvm::StringRef')) string_ref = gdb.Value(struct.pack('PN', int(str_data), int(str_len)), gdb.lookup_type('llvm::StringRef'))
yield 'key', string_ref yield 'key', string_ref
value = entry['second'] value = value_ptr.dereference()
yield 'value', value yield 'value', value
it = it + 1 it = it + 1