From ee9d1e5f76033cd8432713a76381ade76697df04 Mon Sep 17 00:00:00 2001 From: Hannes Domani Date: Mon, 27 Apr 2020 13:14:24 +0200 Subject: Calculate size of array of stubbed type Sizes of stubbed types are calculated on demand in check_typedef, so the same must also be done for arrays of stubbed types. A stubbed type is usually a structure that has only been forward declared, but can also happen if the structure has a virtual function that's not inline in the class definition. For these stubbed types, the size must be recalculated once the full definition is available. gdb/ChangeLog: 2020-04-30 Hannes Domani PR gdb/18706 * gdbtypes.c (check_typedef): Calculate size of array of stubbed type. gdb/testsuite/ChangeLog: 2020-04-30 Hannes Domani PR gdb/18706 * gdb.cp/stub-array-size.cc: New test. * gdb.cp/stub-array-size.exp: New file. * gdb.cp/stub-array-size.h: New test. * gdb.cp/stub-array-size2.cc: New test. --- gdb/ChangeLog | 6 ++++++ gdb/gdbtypes.c | 14 ++++++++++++++ gdb/testsuite/ChangeLog | 8 ++++++++ gdb/testsuite/gdb.cp/stub-array-size.cc | 25 +++++++++++++++++++++++++ gdb/testsuite/gdb.cp/stub-array-size.exp | 30 ++++++++++++++++++++++++++++++ gdb/testsuite/gdb.cp/stub-array-size.h | 21 +++++++++++++++++++++ gdb/testsuite/gdb.cp/stub-array-size2.cc | 22 ++++++++++++++++++++++ 7 files changed, 126 insertions(+) create mode 100644 gdb/testsuite/gdb.cp/stub-array-size.cc create mode 100644 gdb/testsuite/gdb.cp/stub-array-size.exp create mode 100644 gdb/testsuite/gdb.cp/stub-array-size.h create mode 100644 gdb/testsuite/gdb.cp/stub-array-size2.cc diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d9f2b2c..3a8d244 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2020-04-30 Hannes Domani + PR gdb/18706 + * gdbtypes.c (check_typedef): Calculate size of array of + stubbed type. + +2020-04-30 Hannes Domani + PR gdb/15559 * i386-tdep.c (i386_push_dummy_call): Call i386_thiscall_push_dummy_call. diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index 7398435..6648dc4d 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -2873,6 +2873,20 @@ check_typedef (struct type *type) TYPE_LENGTH (type) = TYPE_LENGTH (target_type); TYPE_TARGET_STUB (type) = 0; } + else if (TYPE_CODE (type) == TYPE_CODE_ARRAY) + { + struct type *range_type = check_typedef (TYPE_INDEX_TYPE (type)); + if (has_static_range (TYPE_RANGE_DATA (range_type))) + { + ULONGEST len = 0; + LONGEST low_bound = TYPE_LOW_BOUND (range_type); + LONGEST high_bound = TYPE_HIGH_BOUND (range_type); + if (high_bound >= low_bound) + len = (high_bound - low_bound + 1) * TYPE_LENGTH (target_type); + TYPE_LENGTH (type) = len; + TYPE_TARGET_STUB (type) = 0; + } + } } type = make_qualified_type (type, instance_flags, NULL); diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 6b25cd8..e2bf45b 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,13 @@ 2020-04-30 Hannes Domani + PR gdb/18706 + * gdb.cp/stub-array-size.cc: New test. + * gdb.cp/stub-array-size.exp: New file. + * gdb.cp/stub-array-size.h: New test. + * gdb.cp/stub-array-size2.cc: New test. + +2020-04-30 Hannes Domani + * gdb.python/py-format-string.exp: Adjust pretty_arrays expected output to the new format. diff --git a/gdb/testsuite/gdb.cp/stub-array-size.cc b/gdb/testsuite/gdb.cp/stub-array-size.cc new file mode 100644 index 0000000..281d70d --- /dev/null +++ b/gdb/testsuite/gdb.cp/stub-array-size.cc @@ -0,0 +1,25 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2020 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 . */ + +#include "stub-array-size.h" + +A a[10]; + +int main() +{ + return 0; +}; diff --git a/gdb/testsuite/gdb.cp/stub-array-size.exp b/gdb/testsuite/gdb.cp/stub-array-size.exp new file mode 100644 index 0000000..c43d35b --- /dev/null +++ b/gdb/testsuite/gdb.cp/stub-array-size.exp @@ -0,0 +1,30 @@ +# Copyright 2020 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. + +# Test size of arrays of stubbed types (structures where the full definition +# is not immediately available). + +if {[skip_cplus_tests]} { continue } + +standard_testfile .cc stub-array-size2.cc + +if {[prepare_for_testing "failed to prepare" $testfile "$srcfile $srcfile2" \ + {c++ debug}]} { + return -1 +} + +gdb_test "print sizeof(a)/sizeof(a\[0\])" "10" diff --git a/gdb/testsuite/gdb.cp/stub-array-size.h b/gdb/testsuite/gdb.cp/stub-array-size.h new file mode 100644 index 0000000..5006633 --- /dev/null +++ b/gdb/testsuite/gdb.cp/stub-array-size.h @@ -0,0 +1,21 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2020 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 . */ + +struct A +{ + virtual ~A(); +}; diff --git a/gdb/testsuite/gdb.cp/stub-array-size2.cc b/gdb/testsuite/gdb.cp/stub-array-size2.cc new file mode 100644 index 0000000..8eda4bd --- /dev/null +++ b/gdb/testsuite/gdb.cp/stub-array-size2.cc @@ -0,0 +1,22 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2020 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 . */ + +#include "stub-array-size.h" + +A::~A() +{ +} -- cgit v1.1