From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8202 invoked by alias); 26 Feb 2020 16:12:34 -0000 Mailing-List: contact gdb-testers-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-testers-owner@sourceware.org Received: (qmail 8154 invoked by uid 89); 26 Feb 2020 16:12:34 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-15.0 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.1 spammy=evans, UD:rs X-HELO: kwanyin.sergiodj.net Received: from kwanyin.sergiodj.net (HELO kwanyin.sergiodj.net) (158.69.185.54) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 26 Feb 2020 16:12:24 +0000 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [binutils-gdb] rust/25535 Apply embedded offset to enum variant calculation From: gdb-buildbot@sergiodj.net To: gdb-testers@sourceware.org Message-Id: <084104828cba3e80b19a4bad9538d32991312d7a@gdb-build> Date: Wed, 26 Feb 2020 17:26:00 -0000 X-SW-Source: 2020-q1/txt/msg04031.txt *** TEST RESULTS FOR COMMIT 084104828cba3e80b19a4bad9538d32991312d7a *** commit 084104828cba3e80b19a4bad9538d32991312d7a Author: Doug Evans AuthorDate: Wed Feb 19 13:54:59 2020 -0700 Commit: Tom Tromey CommitDate: Wed Feb 19 13:59:31 2020 -0700 rust/25535 Apply embedded offset to enum variant calculation Hopefully straightforward (and I didn't miss anything ...). gdb/ChangeLog 2020-02-19 Doug Evans 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 PR rust/25535 * gdb.rust/simple.exp: Add test. * gdb.rust/simple.rs: Add test. diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3fdebc9b15..6d3027234a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2020-02-19 Doug Evans + + PR rust/25535 + * rust-lang.c (rust_print_enum): Apply embedded_offset to + rust_enum_variant calculation. + 2020-02-19 Tom Tromey * mips-tdep.h (mips_pc_is_mips): Parameter type is CORE_ADDR. diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index 9123bf2146..18dc6a5647 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -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); diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index e599791f58..0dff20d383 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2020-02-19 Doug Evans + + PR rust/25535 + * gdb.rust/simple.exp: Add test. + * gdb.rust/simple.rs: Add test. + 2020-02-19 Tom de Vries * gdb.base/corefile-buildid.exp (check_exec_file): Match info files diff --git a/gdb/testsuite/gdb.rust/simple.exp b/gdb/testsuite/gdb.rust/simple.exp index aa64e6b08f..b4fcf27426 100644 --- a/gdb/testsuite/gdb.rust/simple.exp +++ b/gdb/testsuite/gdb.rust/simple.exp @@ -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::Some\\(1\\), b: core::option::Option::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 diff --git a/gdb/testsuite/gdb.rust/simple.rs b/gdb/testsuite/gdb.rust/simple.rs index 1280e04449..36448ec45c 100644 --- a/gdb/testsuite/gdb.rust/simple.rs +++ b/gdb/testsuite/gdb.rust/simple.rs @@ -104,6 +104,12 @@ struct SimpleLayout { enum EmptyEnum {} +#[derive(Debug)] +struct EnumWithNonzeroOffset { + a: Option, + b: Option, +} + 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();