diff options
| author | Tom Tromey <tom@tromey.com> | 2016-07-11 15:02:10 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2016-07-21 15:16:04 -0600 |
| commit | 12df5c002dcbfc5ac54983e1e7040a182f71a753 (patch) | |
| tree | 6008ef91eacbb303c3b821642fa012b3cd3b1dd1 /gdb/rust-lang.c | |
| parent | 305450edd3f96bfeebff78300e1e93487563d90a (diff) | |
| download | binutils-12df5c002dcbfc5ac54983e1e7040a182f71a753.zip binutils-12df5c002dcbfc5ac54983e1e7040a182f71a753.tar.gz binutils-12df5c002dcbfc5ac54983e1e7040a182f71a753.tar.bz2 | |
Allow empty struct expressions in Rust
I learned recently that empty struct expressions, like "X{}", have been
promoted from experimental to stable in Rust. This patch changes the
Rust expression parser to allow this case.
New test case included.
Built and regtested on x86-64 Fedora 23, using Rust 1.11 beta.
2016-07-21 Tom Tromey <tom@tromey.com>
* rust-lang.c (rust_tuple_struct_type_p): Return false for empty
structs.
* rust-exp.y (struct_expr_list): Allow empty elements.
2016-07-21 Tom Tromey <tom@tromey.com>
* gdb.rust/simple.rs (main): Use empty struct expression.
* gdb.rust/simple.exp: Add tests for empty struct expression.
Diffstat (limited to 'gdb/rust-lang.c')
| -rw-r--r-- | gdb/rust-lang.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index 3deb525..481a4fc 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -294,7 +294,10 @@ rust_underscore_fields (struct type *type, int offset) int rust_tuple_struct_type_p (struct type *type) { - return rust_underscore_fields (type, 0); + /* This is just an approximation until DWARF can represent Rust more + precisely. We exclude zero-length structs because they may not + be tuple structs, and there's no way to tell. */ + return TYPE_NFIELDS (type) > 0 && rust_underscore_fields (type, 0); } /* Return true if a variant TYPE is a tuple variant, false otherwise. */ |