diff options
| author | Tom Tromey <tom@tromey.com> | 2017-02-03 22:11:46 -0700 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2017-02-03 22:14:36 -0700 |
| commit | f0fd41c1926984fd1a524ff551286cba694539a0 (patch) | |
| tree | 7c41be8737477ed41b8498af6e68ef06c18202d7 /gdb/rust-lang.c | |
| parent | e25dae2ce112305078ae7593da30ababfff53612 (diff) | |
| download | gdb-f0fd41c1926984fd1a524ff551286cba694539a0.zip gdb-f0fd41c1926984fd1a524ff551286cba694539a0.tar.gz gdb-f0fd41c1926984fd1a524ff551286cba694539a0.tar.bz2 | |
Fix ptype of single-member Rust enums
While looking into PR rust/21097, I found that ptype of a
single-element enum in Rust did not always format the result properly.
In particular, it would leave out the members of a tuple struct.
Further testing showed that it also did the wrong thing for ordinary
struct members as well.
This patch fixes these problems. I'm marking it as being associated
with the PR, since that is where the discovery was made; but this
doesn't actually fix that PR (which I think ultimately is due to a
Rust compiler bug).
Built and regtested on x86-64 Fedora 25, using the system Rust
compiler. I'm checking this in.
2017-02-03 Tom Tromey <tom@tromey.com>
PR rust/21097:
* rust-lang.c (rust_print_type) <TYPE_CODE_UNION>: Handle enums
with a single member.
2017-02-03 Tom Tromey <tom@tromey.com>
PR rust/21097:
* gdb.rust/simple.exp: Add new tests.
Diffstat (limited to 'gdb/rust-lang.c')
| -rw-r--r-- | gdb/rust-lang.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index a804824..105b094 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -977,6 +977,8 @@ rust_print_type (struct type *type, const char *varstring, skip_to = 0; } } + else if (TYPE_NFIELDS (type) == 1) + skip_to = 0; for (i = 0; i < TYPE_NFIELDS (type); ++i) { @@ -989,7 +991,9 @@ rust_print_type (struct type *type, const char *varstring, if (TYPE_NFIELDS (variant_type) > skip_to) { int first = 1; - bool is_tuple = rust_tuple_variant_type_p (variant_type); + bool is_tuple = (TYPE_NFIELDS (type) == 1 + ? rust_tuple_struct_type_p (variant_type) + : rust_tuple_variant_type_p (variant_type)); int j; fputs_filtered (is_tuple ? "(" : "{", stream); |