From patchwork Mon Jun 24 09:29:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aktemur, Tankut Baris" X-Patchwork-Id: 33334 Received: (qmail 12132 invoked by alias); 24 Jun 2019 09:31:02 -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 12117 invoked by uid 89); 24 Jun 2019 09:31:01 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy=H*r:LOCAL X-HELO: mga03.intel.com Received: from mga03.intel.com (HELO mga03.intel.com) (134.134.136.65) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 24 Jun 2019 09:31:00 +0000 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Jun 2019 02:30:15 -0700 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga001.fm.intel.com with ESMTP; 24 Jun 2019 02:30:14 -0700 Received: from ulvlx001.iul.intel.com (ulvlx001.iul.intel.com [172.28.207.17]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id x5O9UD66020902; Mon, 24 Jun 2019 10:30:13 +0100 Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id x5O9UDkS022253; Mon, 24 Jun 2019 11:30:13 +0200 Received: (from taktemur@localhost) by ulvlx001.iul.intel.com with LOCAL id x5O9UDMI022249; Mon, 24 Jun 2019 11:30:13 +0200 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Cc: andrew.burgess@embecosm.com Subject: [PATCH v2 1/8] gdb: recognize new DWARF attributes: defaulted, deleted, calling conv. Date: Mon, 24 Jun 2019 11:29:41 +0200 Message-Id: <1561368588-21858-2-git-send-email-tankut.baris.aktemur@intel.com> In-Reply-To: <1561368588-21858-1-git-send-email-tankut.baris.aktemur@intel.com> References: <1561368588-21858-1-git-send-email-tankut.baris.aktemur@intel.com> X-IsSubscribed: yes Extend GDB's internal representation of types to include the DW_AT_calling_convention, DW_AT_defaulted, and DW_AT_deleted attributes that were introduced in DWARF5. gdb/ChangeLog: 2019-MM-DD Tankut Baris Aktemur * dwarf2read.c (dwarf2_add_member_fn): Read the DW_AT_defaulted and DW_AT_deleted attributes of a function. (read_structure_type): Read the DW_AT_calling_convention attribute of a type. * gdbtypes.h (struct fn_field): New field to store the DW_AT_defaulted attribute. (struct fn_field): New field to store the DW_AT_deleted attribute. (struct cplus_struct_type): New field to store the DW_AT_calling_convention attribute. (TYPE_FN_FIELD_DEFAULTED): New macro. (TYPE_FN_FIELD_DELETED): New macro. (TYPE_CPLUS_CALLING_CONVENTION): New macro. * gdbtypes.c: (dump_fn_fieldlists): Update for the changes made to the .h file. (print_cplus_stuff): Likewise. 2019-06-24 Tankut Baris Aktemur --- gdb/dwarf2read.c | 20 ++++++++++++++++++++ gdb/gdbtypes.c | 7 +++++++ gdb/gdbtypes.h | 21 ++++++++++++++++++++- 3 files changed, 47 insertions(+), 1 deletion(-) diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 85f2b1dfc47..125af083a7a 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -15467,6 +15467,16 @@ dwarf2_add_member_fn (struct field_info *fip, struct die_info *die, if (attr && DW_UNSND (attr) != 0) fnp->is_artificial = 1; + /* Check for defaulted methods. */ + attr = dwarf2_attr (die, DW_AT_defaulted, cu); + if (attr) + fnp->defaulted = DW_UNSND (attr); + + /* Check for deleted methods. */ + attr = dwarf2_attr (die, DW_AT_deleted, cu); + if (attr && DW_UNSND (attr) != 0) + fnp->is_deleted = 1; + fnp->is_constructor = dwarf2_is_constructor (die, cu); /* Get index in virtual function table if it is a virtual member @@ -15787,6 +15797,16 @@ read_structure_type (struct die_info *die, struct dwarf2_cu *cu) if (cu->language == language_cplus && die->tag == DW_TAG_class_type) TYPE_DECLARED_CLASS (type) = 1; + /* Store the calling convention in the type if it's available in + the die. Otherwise the calling convention remains set to + the default value DW_CC_normal. */ + attr = dwarf2_attr (die, DW_AT_calling_convention, cu); + if (attr) + { + ALLOCATE_CPLUS_STRUCT_TYPE (type); + TYPE_CPLUS_CALLING_CONVENTION (type) = DW_UNSND (attr); + } + attr = dwarf2_attr (die, DW_AT_byte_size, cu); if (attr) { diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index e329adc368e..c05c10079e1 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -4389,6 +4389,10 @@ dump_fn_fieldlists (struct type *type, int spaces) TYPE_FN_FIELD_PROTECTED (f, overload_idx)); printfi_filtered (spaces + 8, "is_stub %d\n", TYPE_FN_FIELD_STUB (f, overload_idx)); + printfi_filtered (spaces + 8, "defaulted %d\n", + TYPE_FN_FIELD_DEFAULTED (f, overload_idx)); + printfi_filtered (spaces + 8, "is_deleted %d\n", + TYPE_FN_FIELD_DELETED (f, overload_idx)); printfi_filtered (spaces + 8, "voffset %u\n", TYPE_FN_FIELD_VOFFSET (f, overload_idx)); } @@ -4452,6 +4456,9 @@ print_cplus_stuff (struct type *type, int spaces) { dump_fn_fieldlists (type, spaces); } + + printfi_filtered (spaces, "calling_convention %d\n", + TYPE_CPLUS_CALLING_CONVENTION (type)); } /* Print the contents of the TYPE's type_specific union, assuming that diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h index 49653ffcaf7..a5b57898244 100644 --- a/gdb/gdbtypes.h +++ b/gdb/gdbtypes.h @@ -919,6 +919,11 @@ struct fn_field struct type *fcontext; + /* * DW_AT_defaulted attribute for this function; the value is one + of the DW_DEFAULTED enum dwarf_defaulted_attribute constants. */ + + unsigned int defaulted; + /* Attributes. */ unsigned int is_const:1; @@ -936,9 +941,13 @@ struct fn_field unsigned int is_constructor : 1; + /* * True if this function is deleted, false otherwise. */ + + unsigned int is_deleted : 1; + /* * Unused. */ - unsigned int dummy:9; + unsigned int dummy:8; /* * Index into that baseclass's virtual function table, minus 2; else if static: VOFFSET_STATIC; else: 0. */ @@ -1080,6 +1089,12 @@ struct cplus_struct_type classes. */ struct symbol **template_arguments; + + /* * The calling convention for this type, fetched from the + DW_AT_calling_convention attribute. The value is one of the + DW_CC enum dwarf_calling_convention constants. */ + + unsigned calling_convention : 8; }; /* * Struct used to store conversion rankings. */ @@ -1410,6 +1425,8 @@ extern void set_type_vptr_basetype (struct type *, struct type *); ? (struct cplus_struct_type*)&cplus_struct_default \ : TYPE_RAW_CPLUS_SPECIFIC(thistype)) #define TYPE_RAW_CPLUS_SPECIFIC(thistype) TYPE_MAIN_TYPE(thistype)->type_specific.cplus_stuff +#define TYPE_CPLUS_CALLING_CONVENTION(thistype) \ + TYPE_MAIN_TYPE(thistype)->type_specific.cplus_stuff->calling_convention #define TYPE_FLOATFORMAT(thistype) TYPE_MAIN_TYPE(thistype)->type_specific.floatformat #define TYPE_GNAT_SPECIFIC(thistype) TYPE_MAIN_TYPE(thistype)->type_specific.gnat_stuff #define TYPE_DESCRIPTIVE_TYPE(thistype) TYPE_GNAT_SPECIFIC(thistype)->descriptive_type @@ -1526,6 +1543,8 @@ extern void set_type_vptr_basetype (struct type *, struct type *); #define TYPE_FN_FIELD_VOFFSET(thisfn, n) ((thisfn)[n].voffset-2) #define TYPE_FN_FIELD_VIRTUAL_P(thisfn, n) ((thisfn)[n].voffset > 1) #define TYPE_FN_FIELD_STATIC_P(thisfn, n) ((thisfn)[n].voffset == VOFFSET_STATIC) +#define TYPE_FN_FIELD_DEFAULTED(thisfn, n) ((thisfn)[n].defaulted) +#define TYPE_FN_FIELD_DELETED(thisfn, n) ((thisfn)[n].is_deleted) /* Accessors for typedefs defined by a class. */ #define TYPE_TYPEDEF_FIELD_ARRAY(thistype) \