From patchwork Sun Oct 30 02:58:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manish Goregaokar X-Patchwork-Id: 17016 Received: (qmail 125704 invoked by alias); 30 Oct 2016 02:58:56 -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 125687 invoked by uid 89); 30 Oct 2016 02:58:54 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.5 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=no version=3.3.2 spammy=wind, tom@tromey.com, U*tom, D*tromey.com X-HELO: mail-wm0-f42.google.com Received: from mail-wm0-f42.google.com (HELO mail-wm0-f42.google.com) (74.125.82.42) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 30 Oct 2016 02:58:44 +0000 Received: by mail-wm0-f42.google.com with SMTP id p190so86253916wmp.1 for ; Sat, 29 Oct 2016 19:58:44 -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=aOCvqF4VELfn7bSlp1LBT4080FnHXHOBcYZciuoGnC8=; b=eZaYsl+pnD3ryLi5SHKz0QnisR/9dFnczfgNgkQJN7d3Ed/FZQVwMjodIxZR/8xiZQ Z3IfiTFvPVGg+v+PEg77Xk2zYu+Vl1ybvg1TOVF3Ihq1i3px7bTXfsHZewPiDecuPHmY yL1Q4vuL7Uhh+eBzoIa5KBG3zPuNms73oe/44LB8ky74g2GBAOXEHwj9ssFAWgguCODF XhkqY4wc91PXNSSmii93YKoHsK1DrrA0mk7AmuQfxIV27ajkbZvMpVfZ9yguC2Csuckf EUQZ1Q0UpWKveGaEmKYUfdEQTwiiCnz+3CCdAsc9jF28tVcEXFISn9++vrvsDoQoXFVv +26g== X-Gm-Message-State: ABUngvfFVZrVMQnKKar7ObXiIJ2xOkKv6gdr4ZD85ZQIfhgR1PF8TonUTD49/yapjU92+Ua674RGc3OJK3wqnwJy X-Received: by 10.28.40.67 with SMTP id o64mr4597742wmo.5.1477796322396; Sat, 29 Oct 2016 19:58:42 -0700 (PDT) MIME-Version: 1.0 Received: by 10.28.131.21 with HTTP; Sat, 29 Oct 2016 19:58:22 -0700 (PDT) In-Reply-To: <87lgx6wntm.fsf@tromey.com> References: <87pomiwo1z.fsf@tromey.com> <87lgx6wntm.fsf@tromey.com> From: Manish Goregaokar Date: Sat, 29 Oct 2016 19:58:22 -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 `print univariant.a` works for me. New patch (fixed style, added univariant.a test) 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 gdb/testsuite/ChangeLog: * simple.rs: Add test for univariant enums without discriminants * simple.exp: Add test expectations --- gdb/rust-lang.c | 13 ++++++++++++- gdb/testsuite/gdb.rust/simple.exp | 3 +++ gdb/testsuite/gdb.rust/simple.rs | 6 ++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index 82cd3f9..7b1ff8a 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")); diff --git a/gdb/testsuite/gdb.rust/simple.exp b/gdb/testsuite/gdb.rust/simple.exp index 5e00b03..c9e8e57 100644 --- a/gdb/testsuite/gdb.rust/simple.exp +++ b/gdb/testsuite/gdb.rust/simple.exp @@ -103,6 +103,9 @@ 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_sequence "ptype simple::ByeBob" "" { " = struct simple::ByeBob \\(" " i32," diff --git a/gdb/testsuite/gdb.rust/simple.rs b/gdb/testsuite/gdb.rust/simple.rs index eeff3d7..b2e29ae 100644 --- a/gdb/testsuite/gdb.rust/simple.rs +++ b/gdb/testsuite/gdb.rust/simple.rs @@ -63,6 +63,10 @@ enum SpaceSaver { Nothing, } +enum Univariant { + Foo {a: u8} +} + fn main () { let a = (); let b : [i32; 0] = []; @@ -93,6 +97,8 @@ fn main () { let y = HiBob {field1: 7, field2: 8}; let z = ByeBob(7, 8); + let univariant = Univariant::Foo {a : 1}; + let slice = &w[2..3]; let fromslice = slice[0]; let slice2 = &slice[0..1];