From 3ce3b1ba3153a2fc9265ba78cc25acaa7db127ba Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Wed, 28 Jul 2010 19:04:08 +0000 Subject: [PATCH] 2010-07-28 Daniel Jacobowitz gdb/ * dwarf2read.c (read_subroutine_type): Improve THIS detection, handling DW_AT_object_pointer, and workaround GCC PR 43053. gdb/testsuite/ * gdb.cp/member-ptr.exp, gdb.cp/printmethod.exp, gdb.dwarf2/member-ptr-forwardref.exp: Adjust. --- gdb/ChangeLog | 5 +++ gdb/dwarf2read.c | 51 +++++++++++++++++++--- gdb/testsuite/ChangeLog | 5 +++ gdb/testsuite/gdb.cp/member-ptr.exp | 22 +++++----- gdb/testsuite/gdb.cp/printmethod.exp | 4 +- gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.exp | 2 +- 6 files changed, 69 insertions(+), 20 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ebcc04c..05ec70e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2010-07-28 Daniel Jacobowitz + + * dwarf2read.c (read_subroutine_type): Improve THIS detection, + handling DW_AT_object_pointer, and workaround GCC PR 43053. + 2010-07-28 Tom Tromey * Makefile.in (HFILES_NO_SRCDIR): Remove link-warning.h. diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 4c92c61..7a0da0e 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -7395,11 +7395,17 @@ read_subroutine_type (struct die_info *die, struct dwarf2_cu *cu) { if (child_die->tag == DW_TAG_formal_parameter) { - /* Dwarf2 has no clean way to discern C++ static and non-static - member functions. G++ helps GDB by marking the first - parameter for non-static member functions (which is the - this pointer) as artificial. We pass this information - to dwarf2_add_member_fn via TYPE_FIELD_ARTIFICIAL. */ + struct type *arg_type; + + /* DWARF version 2 has no clean way to discern C++ + static and non-static member functions. G++ helps + GDB by marking the first parameter for non-static + member functions (which is the this pointer) as + artificial. We pass this information to + dwarf2_add_member_fn via TYPE_FIELD_ARTIFICIAL. + + DWARF version 3 added DW_AT_object_pointer, which GCC + 4.5 does not yet generate. */ attr = dwarf2_attr (child_die, DW_AT_artificial, cu); if (attr) TYPE_FIELD_ARTIFICIAL (ftype, iparams) = DW_UNSND (attr); @@ -7417,7 +7423,40 @@ read_subroutine_type (struct die_info *die, struct dwarf2_cu *cu) TYPE_FIELD_ARTIFICIAL (ftype, iparams) = 1; } } - TYPE_FIELD_TYPE (ftype, iparams) = die_type (child_die, cu); + arg_type = die_type (child_die, cu); + + /* RealView does not mark THIS as const, which the testsuite + expects. GCC marks THIS as const in method definitions, + but not in the class specifications (GCC PR 43053). */ + if (cu->language == language_cplus && !TYPE_CONST (arg_type) + && TYPE_FIELD_ARTIFICIAL (ftype, iparams)) + { + int is_this = 0; + struct dwarf2_cu *arg_cu = cu; + const char *name = dwarf2_name (child_die, cu); + + attr = dwarf2_attr (die, DW_AT_object_pointer, cu); + if (attr) + { + /* If the compiler emits this, use it. */ + if (follow_die_ref (die, attr, &arg_cu) == child_die) + is_this = 1; + } + else if (name && strcmp (name, "this") == 0) + /* Function definitions will have the argument names. */ + is_this = 1; + else if (name == NULL && iparams == 0) + /* Declarations may not have the names, so like + elsewhere in GDB, assume an artificial first + argument is "this". */ + is_this = 1; + + if (is_this) + arg_type = make_cv_type (1, TYPE_VOLATILE (arg_type), + arg_type, 0); + } + + TYPE_FIELD_TYPE (ftype, iparams) = arg_type; iparams++; } child_die = sibling_die (child_die); diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index ef40fb5..44ee3b9 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-07-28 Daniel Jacobowitz + + * gdb.cp/member-ptr.exp, gdb.cp/printmethod.exp, + gdb.dwarf2/member-ptr-forwardref.exp: Adjust. + 2010-07-28 Tom Tromey PR c++/9946: diff --git a/gdb/testsuite/gdb.cp/member-ptr.exp b/gdb/testsuite/gdb.cp/member-ptr.exp index 329de52..33f121b 100644 --- a/gdb/testsuite/gdb.cp/member-ptr.exp +++ b/gdb/testsuite/gdb.cp/member-ptr.exp @@ -396,7 +396,7 @@ gdb_test_multiple "print ((int) pmi) == ((char *) &a.j - (char *) & a)" $name { set name "ptype pmf" gdb_test_multiple "ptype pmf" $name { - -re "type = int \\( ?A::\\*\\)\\(A \\*, int\\)\r\n$gdb_prompt $" { + -re "type = int \\( ?A::\\*\\)\\(A \\*( const)?, int\\)\r\n$gdb_prompt $" { pass $name } -re "type = int \\( ?A::\\*\\)\\(void\\)\r\n$gdb_prompt $" { @@ -418,7 +418,7 @@ gdb_test_multiple "ptype pmf" $name { set name "print pmf" gdb_test_multiple "print pmf" $name { - -re "$vhn = \\(int \\(A::\\*\\)\\(A \\*, int\\)\\) $hex \r\n$gdb_prompt $" { + -re "$vhn = \\(int \\(A::\\*\\)\\(A \\*( const)?, int\\)\\) $hex \r\n$gdb_prompt $" { pass $name } -re "$vhn = .*not supported with HP aCC.*\r\n$gdb_prompt $" { @@ -440,7 +440,7 @@ gdb_test_multiple "print pmf" $name { set name "ptype pmf_p" gdb_test_multiple "ptype pmf_p" $name { - -re "type = int \\( ?A::\\*\\*\\)\\(A \\*, int\\)\r\n$gdb_prompt $" { + -re "type = int \\( ?A::\\*\\*\\)\\(A \\*( const)?, int\\)\r\n$gdb_prompt $" { pass $name } -re "type = int \\( ?A::\\*\\*\\)\\(void\\)\r\n$gdb_prompt $" { @@ -482,7 +482,7 @@ gdb_test_multiple "print pmf_p" $name { set name "print a.*pmf" gdb_test_multiple "print a.*pmf" $name { - -re "$vhn = {int \\(A \\*, int\\)} $hex \r\n$gdb_prompt $" { + -re "$vhn = {int \\(A \\*( const)?, int\\)} $hex \r\n$gdb_prompt $" { pass $name } -re "Pointers to methods not supported with HP aCC\r\n$gdb_prompt $" { @@ -504,7 +504,7 @@ gdb_test_multiple "print a.*pmf" $name { set name "print a_p->*pmf" gdb_test_multiple "print a_p->*pmf" $name { - -re "$vhn = {int \\(A \\*, int\\)} $hex \r\n$gdb_prompt $" { + -re "$vhn = {int \\(A \\*( const)?, int\\)} $hex \r\n$gdb_prompt $" { pass $name } -re "Pointers to methods not supported with HP aCC\r\n$gdb_prompt $" { @@ -606,7 +606,7 @@ gdb_test_multiple "print (a.*pmf)(3)" $name { } } -gdb_test "ptype a.*pmf" "type = int \\(A \\*, int\\)" +gdb_test "ptype a.*pmf" "type = int \\(A \\*( const)?, int\\)" # Print out a pointer to data member which requires looking into # a base class. @@ -618,9 +618,9 @@ gdb_test "print diamond.*diamond_pmi" "$vhn = 77" # These two have a different object adjustment, but call the same method. gdb_test "print diamond.*left_pmf" \ - "$vhn = {int \\(Diamond \\*\\)} $hex " + "$vhn = {int \\(Diamond \\*( const)?\\)} $hex " gdb_test "print diamond.*right_pmf" \ - "$vhn = {int \\(Diamond \\*\\)} $hex " + "$vhn = {int \\(Diamond \\*( const)?\\)} $hex " gdb_test "print (diamond.*left_pmf) ()" "$vhn = 77" gdb_test "print (diamond.*right_pmf) ()" "$vhn = 88" @@ -628,9 +628,9 @@ gdb_test "print (diamond.*right_pmf) ()" "$vhn = 88" # These two point to different methods, although they have the same # virtual table offsets. gdb_test "print diamond.*left_vpmf" \ - "$vhn = {int \\(Diamond \\*\\)} $hex " + "$vhn = {int \\(Diamond \\*( const)?\\)} $hex " gdb_test "print diamond.*right_vpmf" \ - "$vhn = {int \\(Diamond \\*\\)} $hex " + "$vhn = {int \\(Diamond \\*( const)?\\)} $hex " gdb_test "print (diamond.*left_vpmf) ()" "$vhn = 177" gdb_test "print (diamond.*left_base_vpmf) ()" "$vhn = 2077" @@ -658,5 +658,5 @@ gdb_test "print null_pmi = &A::j" "$vhn = &A::j" gdb_test "print null_pmi = 0" "$vhn = NULL" gdb_test "print null_pmf" "$vhn = NULL" -gdb_test "print null_pmf = &A::foo" "$vhn = \\(int \\(A::\\*\\)\\(A \\*, int\\)\\) $hex " +gdb_test "print null_pmf = &A::foo" "$vhn = \\(int \\(A::\\*\\)\\(A \\*( const)?, int\\)\\) $hex " gdb_test "print null_pmf = 0" "$vhn = NULL" diff --git a/gdb/testsuite/gdb.cp/printmethod.exp b/gdb/testsuite/gdb.cp/printmethod.exp index 12c9ca8..16cd752 100644 --- a/gdb/testsuite/gdb.cp/printmethod.exp +++ b/gdb/testsuite/gdb.cp/printmethod.exp @@ -62,10 +62,10 @@ gdb_continue_to_breakpoint "end of constructors" # The first of these is for PR gdb/653. gdb_test "print theA->virt" \ - "\\$\[0-9\]* = {void \\(A \\*\\)} $hex " \ + "\\$\[0-9\]* = {void \\(A \\* const\\)} $hex " \ "print virtual method." gdb_test "print theA->nonvirt" \ - "\\$\[0-9\]* = {void \\(A \\*\\)} $hex " \ + "\\$\[0-9\]* = {void \\(A \\* const\\)} $hex " \ "print nonvirtual method." gdb_exit diff --git a/gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.exp b/gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.exp index bb947bc..7a72e53 100644 --- a/gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.exp +++ b/gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.exp @@ -45,4 +45,4 @@ gdb_test "show cp-abi" {The currently selected C\+\+ ABI is "gnu-v3".*} gdb_load ${binfile} -gdb_test "ptype c" "type = struct C {\[\r\n \t\]*private:\[\r\n \t\]*int \\(C::\\*fp\\)\\(C \\*\\);\[\r\n \t\]*}" +gdb_test "ptype c" "type = struct C {\[\r\n \t\]*private:\[\r\n \t\]*int \\(C::\\*fp\\)\\(C \\*( const)?\\);\[\r\n \t\]*}" -- 2.7.4