OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rust/25535 Apply embedded offset to enum variant calculation 

Hopefully straightforward (and I didn't miss anything ...).

gdb/ChangeLog
2020-02-19  Doug Evans  <dje@google.com>

	PR rust/25535
	* rust-lang.c (rust_print_enum): Apply embedded_offset to
	rust_enum_variant calculation.

gdb/testsuite/ChangeLog
2020-02-19  Doug Evans  <dje@google.com>

	PR rust/25535
	* gdb.rust/simple.exp: Add test.
	* gdb.rust/simple.rs: Add test.
This commit is contained in:
Doug Evans 2020-02-19 13:54:59 -07:00 committed by Tom Tromey
parent 623563f79d
commit 084104828c
5 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -1,3 +1,9 @@
2020-02-19 Doug Evans <dje@google.com>
PR rust/25535
* rust-lang.c (rust_print_enum): Apply embedded_offset to
rust_enum_variant calculation.
2020-02-19 Tom Tromey <tromey@adacore.com>
* mips-tdep.h (mips_pc_is_mips): Parameter type is CORE_ADDR.

3
gdb/rust-lang.c
View File

@ -481,7 +481,8 @@ rust_print_enum (struct type *type, int embedded_offset,
}
const gdb_byte *valaddr = value_contents_for_printing (val);
struct field *variant_field = rust_enum_variant (type, valaddr);
struct field *variant_field = rust_enum_variant (type,
valaddr + embedded_offset);
embedded_offset += FIELD_BITPOS (*variant_field) / 8;
struct type *variant_type = FIELD_TYPE (*variant_field);

6
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2020-02-19 Doug Evans <dje@google.com>
PR rust/25535
* gdb.rust/simple.exp: Add test.
* gdb.rust/simple.rs: Add test.
2020-02-19 Tom de Vries <tdevries@suse.de>
* gdb.base/corefile-buildid.exp (check_exec_file): Match info files

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

@ -357,6 +357,8 @@ gdb_test_sequence "ptype/o SimpleLayout" "" {
gdb_test "print u2" " = simple::Union2 {name: \\\[1\\\]}"
gdb_test "print nonzero_offset" " = simple::EnumWithNonzeroOffset {a: core::option::Option<u8>::Some\\(1\\), b: core::option::Option<u8>::None}"
# PR rust/23626 - this used to crash. Note that the results are
# fairly lax because most existing versions of Rust (those before the
# DW_TAG_variant patches) do not emit what gdb wants here; and there

8
gdb/testsuite/gdb.rust/simple.rs
View File

@ -104,6 +104,12 @@ struct SimpleLayout {
enum EmptyEnum {}
#[derive(Debug)]
struct EnumWithNonzeroOffset {
a: Option<u8>,
b: Option<u8>,
}
fn main () {
let a = ();
let b : [i32; 0] = [];
@ -186,6 +192,8 @@ fn main () {
let u2 = Union2 { name: [1] };
let nonzero_offset = EnumWithNonzeroOffset { a: Some(1), b: None };
println!("{}, {}", x.0, x.1); // set breakpoint here
println!("{}", diff2(92, 45));
empty();