This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[review] gdb: recognize new DWARF attributes: defaulted, deleted, calling conv.
- From: "Tankut Baris Aktemur (Code Review)" <gerrit at gnutoolchain-gerrit dot osci dot io>
- To: gdb-patches at sourceware dot org
- Date: Fri, 18 Oct 2019 09:53:24 -0400
- Subject: [review] gdb: recognize new DWARF attributes: defaulted, deleted, calling conv.
- Auto-submitted: auto-generated
- References: <gerrit.1571406803000.I54192f363115b78ec7435a8563b73fcace420765@gnutoolchain-gerrit.osci.io>
- Reply-to: tankut dot baris dot aktemur at intel dot com, gdb-patches at sourceware dot org
Tankut Baris Aktemur has uploaded a new change for review.
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/135
......................................................................
gdb: recognize new DWARF attributes: defaulted, deleted, calling conv.
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 <tankut.baris.aktemur@intel.com>
* 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)<defaulted>: New field to store the
DW_AT_defaulted attribute.
(struct fn_field)<is_deleted>: New field to store the DW_AT_deleted
attribute.
(struct cplus_struct_type)<calling_convention>: 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.
Change-Id: I54192f363115b78ec7435a8563b73fcace420765
---
M gdb/dwarf2read.c
M gdb/gdbtypes.c
M gdb/gdbtypes.h
3 files changed, 47 insertions(+), 1 deletion(-)
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 3a88c45..463d9f3 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -15528,6 +15528,16 @@
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
@@ -15848,6 +15858,16 @@
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 fd1c765..d5448cf 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -4394,6 +4394,10 @@
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));
}
@@ -4457,6 +4461,9 @@
{
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 d431cb6..643122a 100644
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -923,6 +923,11 @@
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;
@@ -940,9 +945,13 @@
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. */
@@ -1084,6 +1093,12 @@
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. */
@@ -1414,6 +1429,8 @@
? (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
@@ -1530,6 +1547,8 @@
#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) \
- Follow-Ups:
- [review] gdb: recognize new DWARF attributes: defaulted, deleted, calling conv.
- From: Tankut Baris Aktemur (Code Review)
- [review] gdb: recognize new DWARF attributes: defaulted, deleted, calling conv.
- From: Tankut Baris Aktemur (Code Review)
- [review] gdb: recognize new DWARF attributes: defaulted, deleted, calling conv.
- From: Tom Tromey (Code Review)
- [review] gdb: recognize new DWARF attributes: defaulted, deleted, calling conv.
- From: Tom Tromey (Code Review)
- [review] gdb: recognize new DWARF attributes: defaulted, deleted, calling conv.
- From: Simon Marchi (Code Review)
- [review] gdb: recognize new DWARF attributes: defaulted, deleted, calling conv.
- From: Tankut Baris Aktemur (Code Review)
- [review] gdb: recognize new DWARF attributes: defaulted, deleted, calling conv.
- From: Simon Marchi (Code Review)
- [review] gdb: recognize new DWARF attributes: defaulted, deleted, calling conv.
- From: Tankut Baris Aktemur (Code Review)
- [review v2] gdb: recognize new DWARF attributes: defaulted, deleted, calling conv.
- From: Tankut Baris Aktemur (Code Review)
- [review v2] gdb: recognize new DWARF attributes: defaulted, deleted, calling conv.
- From: Simon Marchi (Code Review)
- [review v3] gdb: recognize new DWARF attributes: defaulted, deleted, calling conv.
- From: Tankut Baris Aktemur (Code Review)
- [review v3] gdb: recognize new DWARF attributes: defaulted, deleted, calling conv.
- From: Simon Marchi (Code Review)
- [review v3] gdb: recognize new DWARF attributes: defaulted, deleted, calling conv.
- From: Simon Marchi (Code Review)
- [review v3] gdb: recognize new DWARF attributes: defaulted, deleted, calling conv.
- From: Tankut Baris Aktemur (Code Review)
- [review v3] gdb: recognize new DWARF attributes: defaulted, deleted, calling conv.
- From: Simon Marchi (Code Review)