From patchwork Thu Mar 27 20:11:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 322 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx22.g.dreamhost.com (caibbdcaabij.dreamhost.com [208.113.200.189]) by wilcox.dreamhost.com (Postfix) with ESMTP id B4BAD3600B7 for ; Thu, 27 Mar 2014 13:12:27 -0700 (PDT) Received: by homiemail-mx22.g.dreamhost.com (Postfix, from userid 14314964) id 6C4F043ED730; Thu, 27 Mar 2014 13:12:27 -0700 (PDT) X-Original-To: gdb@patchwork.siddhesh.in Delivered-To: x14314964@homiemail-mx22.g.dreamhost.com Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by homiemail-mx22.g.dreamhost.com (Postfix) with ESMTPS id 2B92F445BC37 for ; Thu, 27 Mar 2014 13:12:27 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id; q=dns; s= default; b=oao+EyCx8MeIbXnTNnfg7QMfqwLjrr1CMDEI6Xd+6O24s/5yt5SFW 27U7qlwE3rbVFLhGGqKZLl83royecFxv2WB7iVlL8Grj/6Wrs2fC07G4QvigtEEv F4mrb3V89tLLuwzf8vcc1Ynxx2NjTkdvjWqxYTsrzEjXQcyQpmeOoI= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id; s=default; bh=1h+UM/qQ9Wx71VpjdYiXC95dO2U=; b=ylNGWAbgF6l0fo267y7RWJfOsuCS nwz6DvGV+SGoXbZ4oKIU1klIX3phodnRWcwqVdRVqw5D2eGMKY9ze4b7ZvsQj5Hc F0mTrO19WojpyugKy4nJqt4qeW0M4AR++h+CMZiJIJtTR5hcVuaUY94MnV2QB2G8 47CybUATdcqwfK4= Received: (qmail 12360 invoked by alias); 27 Mar 2014 20:12:25 -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 12350 invoked by uid 89); 27 Mar 2014 20:12:25 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.1 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 27 Mar 2014 20:11:56 +0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s2RKBtKA001215 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 27 Mar 2014 16:11:55 -0400 Received: from barimba.redhat.com (ovpn-113-169.phx2.redhat.com [10.3.113.169]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s2RKBsLs032688; Thu, 27 Mar 2014 16:11:54 -0400 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] implement support for "enum class" Date: Thu, 27 Mar 2014 14:11:51 -0600 Message-Id: <1395951111-8189-1-git-send-email-tromey@redhat.com> X-DH-Original-To: gdb@patchwork.siddhesh.in This adds support for the C++11 "enum class" feature. This is PR c++/15246. I chose to use the existing TYPE_DECLARED_CLASS rather than introduce a new type code. This seemed both simple and clear to me. I made overloading support for the new enum types strict. This is how it works in C++; and it didn't seem like an undue burden to keep this, particularly because enum constants are printed symbolically by gdb. Built and regtested on x86-64 Fedora 20. 2014-03-27 Tom Tromey PR c++/15246: * c-exp.y (type_aggregate_p): New function. (qualified_name, classify_inner_name): Use it. * c-typeprint.c (c_type_print_base): Handle TYPE_DECLARED_CLASS and TYPE_TARGET_TYPE of an enum type. * dwarf2read.c (read_enumeration_type): Set TYPE_DECLARED_CLASS on an enum type. (determine_prefix) : New case; handle TYPE_DECLARED_CLASS. * gdbtypes.c (rank_one_type): Handle TYPE_DECLARED_CLASS on enum types. * gdbtypes.h (TYPE_DECLARED_CLASS): Update comment. * valops.c (enum_constant_from_type): New function. (value_aggregate_elt): Use it. * cp-namespace.c (cp_lookup_nested_symbol): Handle TYPE_CODE_ENUM. 2014-03-27 Tom Tromey * gdb.cp/enumclass.exp: New file. * gdb.cp/enumclass.cc: New file. --- gdb/ChangeLog | 19 +++++++++++++++ gdb/c-exp.y | 26 ++++++++++++++------- gdb/c-typeprint.c | 10 ++++++++ gdb/cp-namespace.c | 1 + gdb/dwarf2read.c | 11 +++++++++ gdb/gdbtypes.c | 6 +++++ gdb/gdbtypes.h | 6 +++-- gdb/testsuite/ChangeLog | 5 ++++ gdb/testsuite/gdb.cp/enumclass.cc | 46 ++++++++++++++++++++++++++++++++++++ gdb/testsuite/gdb.cp/enumclass.exp | 48 ++++++++++++++++++++++++++++++++++++++ gdb/valops.c | 40 +++++++++++++++++++++++++++++++ 11 files changed, 207 insertions(+), 11 deletions(-) create mode 100644 gdb/testsuite/gdb.cp/enumclass.cc create mode 100644 gdb/testsuite/gdb.cp/enumclass.exp diff --git a/gdb/c-exp.y b/gdb/c-exp.y index 11631ba..53af59b 100644 --- a/gdb/c-exp.y +++ b/gdb/c-exp.y @@ -124,6 +124,8 @@ static int yylex (void); void yyerror (char *); +static int type_aggregate_p (struct type *); + %} /* Although the yacc "value" of an expression is not used, @@ -957,9 +959,7 @@ qualified_name: TYPENAME COLONCOLON name { struct type *type = $1.type; CHECK_TYPEDEF (type); - if (TYPE_CODE (type) != TYPE_CODE_STRUCT - && TYPE_CODE (type) != TYPE_CODE_UNION - && TYPE_CODE (type) != TYPE_CODE_NAMESPACE) + if (!type_aggregate_p (type)) error (_("`%s' is not defined as an aggregate type."), TYPE_SAFE_NAME (type)); @@ -975,9 +975,7 @@ qualified_name: TYPENAME COLONCOLON name char *buf; CHECK_TYPEDEF (type); - if (TYPE_CODE (type) != TYPE_CODE_STRUCT - && TYPE_CODE (type) != TYPE_CODE_UNION - && TYPE_CODE (type) != TYPE_CODE_NAMESPACE) + if (!type_aggregate_p (type)) error (_("`%s' is not defined as an aggregate type."), TYPE_SAFE_NAME (type)); buf = alloca ($4.length + 2); @@ -1668,6 +1666,18 @@ operator_stoken (const char *op) return st; }; +/* Return true if the type is aggregate-like. */ + +static int +type_aggregate_p (struct type *type) +{ + return (TYPE_CODE (type) == TYPE_CODE_STRUCT + || TYPE_CODE (type) == TYPE_CODE_UNION + || TYPE_CODE (type) == TYPE_CODE_NAMESPACE + || (TYPE_CODE (type) == TYPE_CODE_ENUM + && TYPE_DECLARED_CLASS (type))); +} + /* Validate a parameter typelist. */ static void @@ -2955,9 +2965,7 @@ classify_inner_name (const struct block *block, struct type *context) return classify_name (block, 0); type = check_typedef (context); - if (TYPE_CODE (type) != TYPE_CODE_STRUCT - && TYPE_CODE (type) != TYPE_CODE_UNION - && TYPE_CODE (type) != TYPE_CODE_NAMESPACE) + if (!type_aggregate_p (type)) return ERROR; copy = copy_name (yylval.ssym.stoken); diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c index 4edc9ec..04b6d7b 100644 --- a/gdb/c-typeprint.c +++ b/gdb/c-typeprint.c @@ -1324,6 +1324,8 @@ c_type_print_base (struct type *type, struct ui_file *stream, case TYPE_CODE_ENUM: c_type_print_modifier (type, stream, 0, 1); fprintf_filtered (stream, "enum "); + if (TYPE_DECLARED_CLASS (type)) + fprintf_filtered (stream, "class "); /* Print the tag name if it exists. The aCC compiler emits a spurious "{unnamed struct}"/"{unnamed union}"/"{unnamed enum}" @@ -1349,6 +1351,14 @@ c_type_print_base (struct type *type, struct ui_file *stream, { LONGEST lastval = 0; + if (TYPE_TARGET_TYPE (type) != NULL) + { + struct type *underlying = check_typedef (TYPE_TARGET_TYPE (type)); + + if (TYPE_NAME (underlying) != NULL) + fprintf_filtered (stream, ": %s ", TYPE_NAME (underlying)); + } + fprintf_filtered (stream, "{"); len = TYPE_NFIELDS (type); for (i = 0; i < len; i++) diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c index 74ccd45..03eb6a9 100644 --- a/gdb/cp-namespace.c +++ b/gdb/cp-namespace.c @@ -812,6 +812,7 @@ cp_lookup_nested_symbol (struct type *parent_type, case TYPE_CODE_STRUCT: case TYPE_CODE_NAMESPACE: case TYPE_CODE_UNION: + case TYPE_CODE_ENUM: /* NOTE: Handle modules here as well, because Fortran is re-using the C++ specific code to lookup nested symbols in modules, by calling the function pointer la_lookup_symbol_nonlocal, which ends up here. */ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index cc50f63..83c403a 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -13269,6 +13269,8 @@ read_enumeration_type (struct die_info *die, struct dwarf2_cu *cu) TYPE_LENGTH (type) = TYPE_LENGTH (TYPE_TARGET_TYPE (type)); } + TYPE_DECLARED_CLASS (type) = dwarf2_flag_true_p (die, DW_AT_enum_class, cu); + return set_die_type (die, type, cu); } @@ -18611,6 +18613,15 @@ determine_prefix (struct die_info *die, struct dwarf2_cu *cu) return name; } return ""; + case DW_TAG_enumeration_type: + parent_type = read_type_die (parent, cu); + if (TYPE_DECLARED_CLASS (parent_type)) + { + if (TYPE_TAG_NAME (parent_type) != NULL) + return TYPE_TAG_NAME (parent_type); + return ""; + } + /* Fall through. */ default: return determine_prefix (parent, cu); } diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index 98cb873..8feb745 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -2947,6 +2947,8 @@ rank_one_type (struct type *parm, struct type *arg, struct value *value) case TYPE_CODE_CHAR: case TYPE_CODE_RANGE: case TYPE_CODE_BOOL: + if (TYPE_DECLARED_CLASS (arg)) + return INCOMPATIBLE_TYPE_BADNESS; return INTEGER_PROMOTION_BADNESS; case TYPE_CODE_FLT: return INT_FLOAT_CONVERSION_BADNESS; @@ -2964,6 +2966,8 @@ rank_one_type (struct type *parm, struct type *arg, struct value *value) case TYPE_CODE_RANGE: case TYPE_CODE_BOOL: case TYPE_CODE_ENUM: + if (TYPE_DECLARED_CLASS (parm) || TYPE_DECLARED_CLASS (arg)) + return INCOMPATIBLE_TYPE_BADNESS; return INTEGER_CONVERSION_BADNESS; case TYPE_CODE_FLT: return INT_FLOAT_CONVERSION_BADNESS; @@ -2977,6 +2981,8 @@ rank_one_type (struct type *parm, struct type *arg, struct value *value) case TYPE_CODE_RANGE: case TYPE_CODE_BOOL: case TYPE_CODE_ENUM: + if (TYPE_DECLARED_CLASS (arg)) + return INCOMPATIBLE_TYPE_BADNESS; return INTEGER_CONVERSION_BADNESS; case TYPE_CODE_FLT: return INT_FLOAT_CONVERSION_BADNESS; diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h index c6943ef..9599e1c 100644 --- a/gdb/gdbtypes.h +++ b/gdb/gdbtypes.h @@ -330,8 +330,10 @@ enum type_instance_flag_value #define TYPE_OBJFILE(t) (TYPE_OBJFILE_OWNED(t)? TYPE_OWNER(t).objfile : NULL) /* * True if this type was declared using the "class" keyword. This is - only valid for C++ structure types, and only used for displaying - the type. If false, the structure was declared as a "struct". */ + only valid for C++ structure and enum types. If false, a structure + was declared as a "struct"; if true it was declared "class". For + enum types, this is true when "enum class" or "enum struct" was + used to declare the type.. */ #define TYPE_DECLARED_CLASS(t) (TYPE_MAIN_TYPE (t)->flag_declared_class) diff --git a/gdb/testsuite/gdb.cp/enumclass.cc b/gdb/testsuite/gdb.cp/enumclass.cc new file mode 100644 index 0000000..bddfbbb --- /dev/null +++ b/gdb/testsuite/gdb.cp/enumclass.cc @@ -0,0 +1,46 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2014 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +enum class E1 { + HI = 7, THERE +}; + +enum class E2 { + HI = 23, THERE +}; + +// overload1(E1::HI) is ok. +// overload1(77) is ok. +int overload1 (int v) { return 0; } +int overload1 (E1 v) { return static_cast (v); } +int overload1 (E2 v) { return - static_cast (v); } + +// overload2(E1::HI) is ok. +// overload1(77) fails. +int overload2 (E1 v) { return static_cast (v); } +int overload2 (E2 v) { return - static_cast (v); } + +// overload3(E1::HI) fails. +// overload1(77) is ok. +int overload3 (int v) { return 0; } +int overload3 (E2 v) { return static_cast (v); } + +int +main (void) +{ + return 0; +} diff --git a/gdb/testsuite/gdb.cp/enumclass.exp b/gdb/testsuite/gdb.cp/enumclass.exp new file mode 100644 index 0000000..eed06ec --- /dev/null +++ b/gdb/testsuite/gdb.cp/enumclass.exp @@ -0,0 +1,48 @@ +# Copyright 2014 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# This file is part of the gdb testsuite + +if {[skip_cplus_tests]} { continue } + +standard_testfile .cc + +if {[prepare_for_testing $testfile.exp $testfile $srcfile \ + {debug c++ additional_flags=-std=c++11}]} { + return -1 +} + +if {![runto_main]} { + return -1 +} + +gdb_test "ptype E1" \ + "type = enum class E1 {E1::HI = 7, E1::THERE}" + +gdb_test "print E1::HI" " = E1::HI" +gdb_test "print (int) E1::HI" " = 7" +gdb_test "print (int) E2::HI" " = 23" +gdb_test "print HI" "No symbol .HI.*" + +gdb_test "print overload1(E1::THERE)" " = 8" +gdb_test "print overload1(77)" " = 0" + +gdb_test "print overload2(E1::THERE)" " = 8" +gdb_test "print overload2(77)" \ + "Cannot resolve function overload2 to any overloaded instance" + +gdb_test "print overload3(E1::THERE)" \ + "Cannot resolve function overload3 to any overloaded instance" +gdb_test "print overload3(77)" " = 0" diff --git a/gdb/valops.c b/gdb/valops.c index a10dbd6..e59e075 100644 --- a/gdb/valops.c +++ b/gdb/valops.c @@ -3007,6 +3007,42 @@ destructor_name_p (const char *name, struct type *type) return 0; } +/* Find an enum constant named NAME in TYPE. TYPE must be an "enum + class". If the name is found, return a value representing it; + otherwise throw an exception. */ + +static struct value * +enum_constant_from_type (struct type *type, const char *name) +{ + int i; + int name_len = strlen (name); + + gdb_assert (TYPE_CODE (type) == TYPE_CODE_ENUM + && TYPE_DECLARED_CLASS (type)); + + for (i = TYPE_N_BASECLASSES (type); i < TYPE_NFIELDS (type); ++i) + { + const char *fname = TYPE_FIELD_NAME (type, i); + int len; + + if (TYPE_FIELD_LOC_KIND (type, i) != FIELD_LOC_KIND_ENUMVAL + || fname == NULL) + continue; + + /* Look for the trailing "::NAME", since enum class constant + names are qualified here. */ + len = strlen (fname); + if (len + 2 >= name_len + && fname[len - name_len - 2] == ':' + && fname[len - name_len - 1] == ':' + && strcmp (&fname[len - name_len], name) == 0) + return value_from_longest (type, TYPE_FIELD_ENUMVAL (type, i)); + } + + error (_("no constant named \"%s\" in enum \"%s\""), + name, TYPE_TAG_NAME (type)); +} + /* C++: Given an aggregate type CURTYPE, and a member name NAME, return the appropriate member (or the address of the member, if WANT_ADDRESS). This function is used to resolve user expressions @@ -3028,6 +3064,10 @@ value_aggregate_elt (struct type *curtype, const char *name, case TYPE_CODE_NAMESPACE: return value_namespace_elt (curtype, name, want_address, noside); + + case TYPE_CODE_ENUM: + return enum_constant_from_type (curtype, name); + default: internal_error (__FILE__, __LINE__, _("non-aggregate type in value_aggregate_elt"));