mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

debuginfo: Fix LLDB pretty printer for enum variants with zero fields.

Browse Source
This commit is contained in:
Michael Woerister 2014-11-26 17:42:32 +01:00
parent 7608d06027
commit 67ba096cc3
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/etc/lldb_rust_formatters.py
View File

@ -69,8 +69,14 @@ def print_struct_val_starting_from(field_start_index, val, internal_dict):
assert val.GetType().GetTypeClass() == lldb.eTypeClassStruct
t = val.GetType()
has_field_names = type_has_field_names(t)
type_name = extract_type_name(t.GetName())
num_children = val.num_children
if (num_children - field_start_index) == 0:
# The only field of this struct is the enum discriminant
return type_name
has_field_names = type_has_field_names(t)
if has_field_names:
template = "%(type_name)s {\n%(body)s\n}"
@ -83,8 +89,6 @@ def print_struct_val_starting_from(field_start_index, val, internal_dict):
# this is a tuple, so don't print the type name
type_name = ""
num_children = val.num_children
def render_child(child_index):
this = ""
if has_field_names:
@ -105,7 +109,6 @@ def print_enum_val(val, internal_dict):
assert val.GetType().GetTypeClass() == lldb.eTypeClassUnion
if val.num_children == 1:
# This is either an enum with just one variant, or it is an Option-like enum
# where the discriminant is encoded in a non-nullable pointer field. We find