user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix zero-sized BTreeMap gdb pretty-printer

Browse source 
`gdb.parse_and_eval("()")` is needed because GDB treats "()" as a Rust array of two characters, not as a unit
This commit is contained in:
ortem 2020-11-20 18:01:15 +03:00
parent 068320b39e
commit 685e1f3e45
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/etc/gdb_providers.py
View file

@ -1,7 +1,6 @@
from sys import version_info
import gdb
from gdb import lookup_type
if version_info[0] >= 3:
xrange = range
@ -213,7 +212,7 @@ def children_of_btree_map(map):
def children_of_node(node_ptr, height):
def cast_to_internal(node):
internal_type_name = node.type.target().name.replace("LeafNode", "InternalNode", 1)
internal_type = lookup_type(internal_type_name)
internal_type = gdb.lookup_type(internal_type_name)
return node.cast(internal_type.pointer())
leaf = node_ptr.dereference()
@ -230,8 +229,10 @@ def children_of_btree_map(map):
yield child
if i < length:
# Avoid "Cannot perform pointer math on incomplete type" on zero-sized arrays.
key = keys[i]["value"]["value"] if keys.type.sizeof > 0 else "()"
val = vals[i]["value"]["value"] if vals.type.sizeof > 0 else "()"
key_type_size = keys.type.sizeof
val_type_size = vals.type.sizeof
key = keys[i]["value"]["value"] if key_type_size > 0 else gdb.parse_and_eval("()")
val = vals[i]["value"]["value"] if val_type_size > 0 else gdb.parse_and_eval("()")
yield key, val
if map["length"] > 0: