Skip to content

Commit 92e4fb0

Browse files
committed
Auto merge of #79235 - ortem:fix-btreemap-gdb-pretty-printer, r=Mark-Simulacrum
Fix zero-sized BTreeMap gdb pretty-printer `gdb.parse_and_eval("()")` is needed because GDB treats "()" as a Rust array of two characters, not as a unit Based on intellij-rust/intellij-rust#6356
2 parents eb4860c + 685e1f3 commit 92e4fb0

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

Diff for: src/etc/gdb_providers.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from sys import version_info
22

33
import gdb
4-
from gdb import lookup_type
54

65
if version_info[0] >= 3:
76
xrange = range
@@ -213,7 +212,7 @@ def children_of_btree_map(map):
213212
def children_of_node(node_ptr, height):
214213
def cast_to_internal(node):
215214
internal_type_name = node.type.target().name.replace("LeafNode", "InternalNode", 1)
216-
internal_type = lookup_type(internal_type_name)
215+
internal_type = gdb.lookup_type(internal_type_name)
217216
return node.cast(internal_type.pointer())
218217

219218
if node_ptr.type.name.startswith("alloc::collections::btree::node::BoxedNode<"):
@@ -233,8 +232,10 @@ def cast_to_internal(node):
233232
yield child
234233
if i < length:
235234
# Avoid "Cannot perform pointer math on incomplete type" on zero-sized arrays.
236-
key = keys[i]["value"]["value"] if keys.type.sizeof > 0 else "()"
237-
val = vals[i]["value"]["value"] if vals.type.sizeof > 0 else "()"
235+
key_type_size = keys.type.sizeof
236+
val_type_size = vals.type.sizeof
237+
key = keys[i]["value"]["value"] if key_type_size > 0 else gdb.parse_and_eval("()")
238+
val = vals[i]["value"]["value"] if val_type_size > 0 else gdb.parse_and_eval("()")
238239
yield key, val
239240

240241
if map["length"] > 0:

0 commit comments

Comments
 (0)