Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

Fix ptype of single-member Rust enums

Browse Source 
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.
This commit is contained in:
Tom Tromey
2017-02-03 22:11:46 -07:00
parent e25dae2ce1
commit f0fd41c192
4 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@@ -1,3 +1,9 @@
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 Pedro Alves <palves@redhat.com> 2017-02-03 Pedro Alves <palves@redhat.com>
* cli/cli-interp.c (cli_interp_base::cli_interp_base) * cli/cli-interp.c (cli_interp_base::cli_interp_base)

6
gdb/rust-lang.c
View File

@@ -977,6 +977,8 @@ rust_print_type (struct type *type, const char *varstring,
skip_to = 0; skip_to = 0;
} }
} }
else if (TYPE_NFIELDS (type) == 1)
skip_to = 0;
for (i = 0; i < TYPE_NFIELDS (type); ++i) 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) if (TYPE_NFIELDS (variant_type) > skip_to)
{ {
int first = 1; 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; int j;
fputs_filtered (is_tuple ? "(" : "{", stream); fputs_filtered (is_tuple ? "(" : "{", stream);

5
gdb/testsuite/ChangeLog
View File

@@ -1,3 +1,8 @@
2017-02-03 Tom Tromey <tom@tromey.com>
PR rust/21097:
* gdb.rust/simple.exp: Add new tests.
2017-02-02 Pedro Alves <palves@redhat.com> 2017-02-02 Pedro Alves <palves@redhat.com>
* gdb.mi/mi-logging.exp: Add "redirect while already logging" * gdb.mi/mi-logging.exp: Add "redirect while already logging"

12
gdb/testsuite/gdb.rust/simple.exp
View File

@@ -110,6 +110,18 @@ gdb_test "print univariant.a" " = 1"
gdb_test "print univariant_anon" " = simple::UnivariantAnon::Foo\\(1\\)" gdb_test "print univariant_anon" " = simple::UnivariantAnon::Foo\\(1\\)"
gdb_test "print univariant_anon.0" " = 1" gdb_test "print univariant_anon.0" " = 1"
gdb_test_sequence "ptype simple::Univariant" "" {
"type = enum simple::Univariant \\{"
" Foo\\{a: u8\\},"
"\\}"
}
gdb_test_sequence "ptype simple::UnivariantAnon" "" {
"type = enum simple::UnivariantAnon \\{"
" Foo\\(u8\\),"
"\\}"
}
gdb_test_sequence "ptype simple::ByeBob" "" { gdb_test_sequence "ptype simple::ByeBob" "" {
" = struct simple::ByeBob \\(" " = struct simple::ByeBob \\("
" i32," " i32,"