This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH PR gdb/16841] virtual inheritance via typedef cannot find base
- From: Weimin Pan <weimin dot pan at oracle dot com>
- To: gdb-patches at sourceware dot org
- Date: Fri, 15 Jun 2018 23:45:13 +0000
- Subject: [PATCH PR gdb/16841] virtual inheritance via typedef cannot find base
Fix failure to find member of a typedef base class
The test case below demonstrates the problem, as described in this PR's Comment 5:
typedef struct {
int x;
} A;
struct C : A {
int y;
};
int main()
{
C c;
return 55;
}
$ gdb a.out
(gdb) ptype C::x
Internal error: non-aggregate type to value_struct_elt_for_reference
In value_struct_elt_for_reference(), need to call check_typedef() on
the aggregate type to handle the case of *curtype being ptr->typedef.
Tested on x86_64-linux. No regressions.
---
gdb/ChangeLog | 6 +++++
gdb/testsuite/ChangeLog | 6 +++++
gdb/testsuite/gdb.cp/typedef-base-ptype.cc | 30 +++++++++++++++++++++++
gdb/testsuite/gdb.cp/typedef-base-ptype.exp | 37 +++++++++++++++++++++++++++++
gdb/valops.c | 2 +-
5 files changed, 80 insertions(+), 1 deletion(-)
create mode 100644 gdb/testsuite/gdb.cp/typedef-base-ptype.cc
create mode 100644 gdb/testsuite/gdb.cp/typedef-base-ptype.exp
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ff2f145..99a3175 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2018-06-12 Weimin Pan <weimin.pan@oracle.com>
+
+ PR gdb/16841
+ * valops.c (value_struct_elt_for_reference): Call check_typedef on
+ aggregate type to get its real type before accessing it.
+
2018-05-29 Weimin Pan <weimin.pan@oracle.com>
* minsyms.h (lookup_minimal_symbol_and_objfile): Remove declaration.
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index b2938b1..78771d3 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2018-06-12 Weimin Pan <weimin.pan@oracle.com>
+
+ PR gdb/16841
+ * gdb/testsuite/gdb.cp/typedef-base-ptype.cc: New file.
+ * gdb/testsuite/gdb.cp/typedef-base-ptype.exp: New file.
+
2018-05-24 Andrew Burgess <andrew.burgess@embecosm.com>
PR gdb/23203
diff --git a/gdb/testsuite/gdb.cp/typedef-base-ptype.cc b/gdb/testsuite/gdb.cp/typedef-base-ptype.cc
new file mode 100644
index 0000000..bfbcc4a
--- /dev/null
+++ b/gdb/testsuite/gdb.cp/typedef-base-ptype.cc
@@ -0,0 +1,30 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+ Copyright 2018 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 <http://www.gnu.org/licenses/>. */
+
+typedef struct {
+ int x;
+} A;
+
+struct C : A {
+ int y;
+};
+
+int main()
+{
+ C c;
+ return 55;
+}
diff --git a/gdb/testsuite/gdb.cp/typedef-base-ptype.exp b/gdb/testsuite/gdb.cp/typedef-base-ptype.exp
new file mode 100644
index 0000000..e588fd3
--- /dev/null
+++ b/gdb/testsuite/gdb.cp/typedef-base-ptype.exp
@@ -0,0 +1,37 @@
+# Copyright 2018 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 <http://www.gnu.org/licenses/>.
+
+if { [skip_cplus_tests] } { continue }
+
+standard_testfile .cc
+
+if [get_compiler_info "c++"] {
+ return -1
+}
+
+if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
+ return -1
+}
+
+clean_restart $testfile
+
+if ![runto_main] {
+ untested "could not run to main"
+ return -1
+}
+
+gdb_test "ptype C::x" \
+ "type = int" \
+ "ptype typedef base struct member"
diff --git a/gdb/valops.c b/gdb/valops.c
index 62a86c0..3970a25 100644
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -3343,7 +3343,7 @@ value_struct_elt_for_reference (struct type *domain, int offset,
int want_address,
enum noside noside)
{
- struct type *t = curtype;
+ struct type *t = check_typedef (curtype);
int i;
struct value *v, *result;
--
1.8.3.1