bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix HashMap/HashSet LLDB pretty-printer after hashbrown 0.11.0

Browse source 
The pretty-printer was broken in https://github.com/rust-lang/rust/pull/77566
after updating hashbrown to 0.11.0.
Note that the corresponding GDB pretty-printer was updated properly.
This commit is contained in:
ortem 2021-04-06 12:23:28 +03:00
parent 5a7a0ac51e
commit 3d3a5ca79f
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/etc/lldb_providers.py
View file

@ -527,20 +527,22 @@ class StdHashMapSyntheticProvider:
def update(self): def update(self):
# type: () -> None # type: () -> None
table = self.table() table = self.table()
capacity = table.GetChildMemberWithName("bucket_mask").GetValueAsUnsigned() + 1 inner_table = table.GetChildMemberWithName("table")
ctrl = table.GetChildMemberWithName("ctrl").GetChildAtIndex(0)
self.size = table.GetChildMemberWithName("items").GetValueAsUnsigned() capacity = inner_table.GetChildMemberWithName("bucket_mask").GetValueAsUnsigned() + 1
ctrl = inner_table.GetChildMemberWithName("ctrl").GetChildAtIndex(0)
self.size = inner_table.GetChildMemberWithName("items").GetValueAsUnsigned()
self.pair_type = table.type.template_args[0] self.pair_type = table.type.template_args[0]
if self.pair_type.IsTypedefType(): if self.pair_type.IsTypedefType():
self.pair_type = self.pair_type.GetTypedefedType() self.pair_type = self.pair_type.GetTypedefedType()
self.pair_type_size = self.pair_type.GetByteSize() self.pair_type_size = self.pair_type.GetByteSize()
self.new_layout = not table.GetChildMemberWithName("data").IsValid() self.new_layout = not inner_table.GetChildMemberWithName("data").IsValid()
if self.new_layout: if self.new_layout:
self.data_ptr = ctrl.Cast(self.pair_type.GetPointerType()) self.data_ptr = ctrl.Cast(self.pair_type.GetPointerType())
else: else:
self.data_ptr = table.GetChildMemberWithName("data").GetChildAtIndex(0) self.data_ptr = inner_table.GetChildMemberWithName("data").GetChildAtIndex(0)
u8_type = self.valobj.GetTarget().GetBasicType(eBasicTypeUnsignedChar) u8_type = self.valobj.GetTarget().GetBasicType(eBasicTypeUnsignedChar)
u8_type_size = self.valobj.GetTarget().GetBasicType(eBasicTypeUnsignedChar).GetByteSize() u8_type_size = self.valobj.GetTarget().GetBasicType(eBasicTypeUnsignedChar).GetByteSize()
@ -563,7 +565,7 @@ class StdHashMapSyntheticProvider:
# HashSet wraps either std HashMap or hashbrown::HashSet, which both # HashSet wraps either std HashMap or hashbrown::HashSet, which both
# wrap hashbrown::HashMap, so either way we "unwrap" twice. # wrap hashbrown::HashMap, so either way we "unwrap" twice.
hashbrown_hashmap = self.valobj.GetChildAtIndex(0).GetChildAtIndex(0) hashbrown_hashmap = self.valobj.GetChildAtIndex(0).GetChildAtIndex(0)
return hashbrown_hashmap.GetChildMemberWithName("table").GetChildMemberWithName("table") return hashbrown_hashmap.GetChildMemberWithName("table")
def has_children(self): def has_children(self):
# type: () -> bool # type: () -> bool