From patchwork Sun Oct 30 03:39:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manish Goregaokar X-Patchwork-Id: 17017 Received: (qmail 82384 invoked by alias); 30 Oct 2016 03:40:23 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 82324 invoked by uid 89); 30 Oct 2016 03:40:21 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.4 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=no version=3.3.2 spammy=follow-up, tom@tromey.com, U*tom, D*tromey.com X-HELO: mail-wm0-f51.google.com Received: from mail-wm0-f51.google.com (HELO mail-wm0-f51.google.com) (74.125.82.51) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 30 Oct 2016 03:40:11 +0000 Received: by mail-wm0-f51.google.com with SMTP id 140so131688377wmv.0 for ; Sat, 29 Oct 2016 20:40:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=snu/tLBFyso0zNBorPUThZtsnQEITPR7SOzWlaGvtTQ=; b=j4wvL777JYW0wQgOq0ox6aTa0fmZROo3u4wyUd1ZvGC38no1mYnidgrqxyzX9Lde/9 OwssQyxyXec7CI/jL72XM3X13a2HaI9oaDMqQ1Nbn2ZwjMXc0zxvsnI0q6citGIhqekz r0gsm4nm8UeqM1TCWB9KvrtlvC+f2mF+6G7WQ/1Fw6WhgNJkg5+R50KZ9pHVQ4afMC6K bE7VMsb13Q3bfH9F4vLX7KuIriH7s0jfR9kfTSnpv4ikN+9nIq76VqO7HEtR20V5QgVw vuMYcZQOUev85IKR3Fl9TChtQNddQyy9ESuB9teuPfqN70JTCrSceX7XlEpIuvxzxTtv w49g== X-Gm-Message-State: ABUngveSoehAt5tC7UrsYO4T2oN0kXJ0R+14KLX0/lMJik+CrrnWvvrgoZ9ngmnx9k1i80UAodblvbB19sHAaqRH X-Received: by 10.28.228.5 with SMTP id b5mr4663282wmh.101.1477798809070; Sat, 29 Oct 2016 20:40:09 -0700 (PDT) MIME-Version: 1.0 Received: by 10.28.131.21 with HTTP; Sat, 29 Oct 2016 20:39:48 -0700 (PDT) In-Reply-To: References: <87pomiwo1z.fsf@tromey.com> <87lgx6wntm.fsf@tromey.com> <87d1iiwlvx.fsf@tromey.com> From: Manish Goregaokar Date: Sat, 29 Oct 2016 20:39:48 -0700 Message-ID: Subject: Re: [PATCH] Fix handling of discriminantless univariant enums in Rust To: Tom Tromey Cc: gdb-patches@sourceware.org X-IsSubscribed: yes Rolled up patch: From 789f95700e43b29d0c374985f8504eb414c85eec Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Thu, 27 Oct 2016 16:46:34 -0700 Subject: [PATCH] Fix handling of discriminantless univariant enums in Rust; fix bug with encoded enums 2016-10-27 Manish Goregaokar gdb/ChangeLog: * rust-lang.c (rust_get_disr_info): Treat univariant enums without discriminants as encoded enums with a real field * rust-lang.c (rust_evaluate_subexp): Handle field access on encoded struct-like enums gdb/testsuite/ChangeLog: * simple.rs: Add test for univariant enums without discriminants and for encoded struct-like enums * simple.exp: Add test expectations --- gdb/rust-lang.c | 17 +++++++++++++++-- gdb/testsuite/gdb.rust/simple.exp | 11 +++++++++++ gdb/testsuite/gdb.rust/simple.rs | 30 ++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 2 deletions(-) diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index 82cd3f9..63c7992 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -194,7 +194,18 @@ rust_get_disr_info (struct type *type, const gdb_byte *valaddr, has changed its debuginfo format. */ error (_("Could not find enum discriminant field")); } - + else if (TYPE_NFIELDS (type) == 1) { + /* Sometimes univariant enums are encoded without a + discriminant. In that case, treating it as an encoded enum + with the first field being the actual type works. */ + const char* field_name = TYPE_NAME (TYPE_FIELD_TYPE (type, 0)); + ret.name = concat (TYPE_NAME (type), "::", + rust_last_path_segment (field_name), + (char *) NULL); + ret.field_no = RUST_ENCODED_ENUM_REAL; + ret.is_encoded = 1; + return ret; + } if (strcmp (TYPE_FIELD_NAME (disr_type, 0), "RUST$ENUM$DISR") != 0) error (_("Rust debug format has changed")); @@ -1725,7 +1736,9 @@ tuple structs, and tuple-like enum variants")); variant_type = TYPE_FIELD_TYPE (type, disr.field_no); if (variant_type == NULL - || rust_tuple_variant_type_p (variant_type)) + || (disr.is_encoded + ? rust_tuple_struct_type_p (variant_type) + : rust_tuple_variant_type_p (variant_type))) error(_("Attempting to access named field %s of tuple variant %s, \ which has only anonymous fields"), field_name, disr.name); diff --git a/gdb/testsuite/gdb.rust/simple.exp b/gdb/testsuite/gdb.rust/simple.exp index 5e00b03..14eae2e 100644 --- a/gdb/testsuite/gdb.rust/simple.exp +++ b/gdb/testsuite/gdb.rust/simple.exp @@ -103,6 +103,11 @@ gdb_test_sequence "ptype z" "" { } gdb_test "print z.1" " = 8" +gdb_test "print univariant" " = simple::Univariant::Foo{a: 1}" +gdb_test "print univariant.a" " = 1" +gdb_test "print univariant_anon" " = simple::UnivariantAnon::Foo\\(1\\)" +gdb_test "print univariant_anon.0" " = 1" + gdb_test_sequence "ptype simple::ByeBob" "" { " = struct simple::ByeBob \\(" " i32," @@ -220,3 +225,9 @@ gdb_test "print (1,)" "Tuple expressions not supported yet" gdb_test "print (1)" " = 1" gdb_test "print 23..97.0" "Range expression with different types" + +gdb_test "print (*parametrized.next.val)" \ + " = simple::ParametrizedStruct {next: simple::ParametrizedEnum>>::Empty, value: 1}" +gdb_test "print parametrized.next.val" " = \\(simple::ParametrizedStruct \\*\\) $hex" +gdb_test "print parametrized" \ + " = simple::ParametrizedStruct \\{next: simple::ParametrizedEnum>>::Val\\{val: $hex\\}, value: 0\\}" \ No newline at end of file diff --git a/gdb/testsuite/gdb.rust/simple.rs b/gdb/testsuite/gdb.rust/simple.rs index eeff3d7..670f54e 100644 --- a/gdb/testsuite/gdb.rust/simple.rs +++ b/gdb/testsuite/gdb.rust/simple.rs @@ -63,6 +63,23 @@ enum SpaceSaver { Nothing, } +enum Univariant { + Foo {a: u8} +} +enum UnivariantAnon { + Foo(u8) +} + +enum ParametrizedEnum { + Val { val: T }, + Empty, +} + +struct ParametrizedStruct { + next: ParametrizedEnum>>, + value: T +} + fn main () { let a = (); let b : [i32; 0] = []; @@ -93,6 +110,9 @@ fn main () { let y = HiBob {field1: 7, field2: 8}; let z = ByeBob(7, 8); + let univariant = Univariant::Foo {a : 1}; + let univariant_anon = UnivariantAnon::Foo(1); + let slice = &w[2..3]; let fromslice = slice[0]; let slice2 = &slice[0..1]; @@ -117,6 +137,16 @@ fn main () { let custom_some = NonZeroOptimized::Value("hi".into()); let custom_none = NonZeroOptimized::Empty; + let parametrized = ParametrizedStruct { + next: ParametrizedEnum::Val { + val: Box::new(ParametrizedStruct { + next: ParametrizedEnum::Empty, + value: 1, + }) + }, + value: 0, + }; + println!("{}, {}", x.0, x.1); // set breakpoint here println!("{}", diff2(92, 45)); empty();