Skip to content

Commit 1652759

Browse files
authored
Rollup merge of #81834 - ortem:fix-LLDB-hashmap-pretty-printers, r=Mark-Simulacrum
Resolve typedef in HashMap lldb pretty-printer only if possible Fixes #81814 Previously, `GetTypedefedType` was invoked unconditionally. But this did not work in case of `rust-lldb` without Rust patches since there was no typedef.
2 parents d19f375 + 9ce070d commit 1652759

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/etc/lldb_providers.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,9 @@ def update(self):
531531
ctrl = table.GetChildMemberWithName("ctrl").GetChildAtIndex(0)
532532

533533
self.size = table.GetChildMemberWithName("items").GetValueAsUnsigned()
534-
self.pair_type = table.type.template_args[0].GetTypedefedType()
534+
self.pair_type = table.type.template_args[0]
535+
if self.pair_type.IsTypedefType():
536+
self.pair_type = self.pair_type.GetTypedefedType()
535537
self.pair_type_size = self.pair_type.GetByteSize()
536538

537539
self.new_layout = not table.GetChildMemberWithName("data").IsValid()

0 commit comments

Comments
 (0)