* [PATCH][gdb/symtab] Don't complain about inlined functions
@ 2022-09-09 12:57 Tom de Vries
2022-10-04 14:52 ` [committed][gdb/symtab] " Tom de Vries
0 siblings, 1 reply; 2+ messages in thread
From: Tom de Vries @ 2022-09-09 12:57 UTC (permalink / raw)
To: gdb-patches
Hi,
With the test-case included in this patch, we get:
...
(gdb) ptype main^M
During symbol reading: cannot get low and high bounds for subprogram DIE \
at 0x113^M
During symbol reading: cannot get low and high bounds for subprogram DIE \
at 0x11f^M
type = int (void)^M
(gdb) FAIL: gdb.dwarf2/inline.exp: ptype main
...
The complaints are about foo, with DW_AT_inline == DW_INL_inlined:
...
<1><11f>: Abbrev Number: 6 (DW_TAG_subprogram)
<120> DW_AT_name : foo
<126> DW_AT_prototyped : 1
<126> DW_AT_type : <0x10c>
<12a> DW_AT_inline : 1 (inlined)
...
and foo2, with DW_AT_inline == DW_INL_declared_inlined:
...
<1><113>: Abbrev Number: 5 (DW_TAG_subprogram)
<114> DW_AT_name : foo2
<11a> DW_AT_prototyped : 1
<11a> DW_AT_type : <0x10c>
<11e> DW_AT_inline : 3 (declared as inline and inlined)
...
Fix this by not complaining about inlined functions.
Tested on x86_64-linux.
Any comments?
Thanks,
- Tom
[gdb/symtab] Don't complain about inlined functions
---
gdb/dwarf2/read.c | 9 ++++++++-
gdb/testsuite/gdb.dwarf2/inline.c | 34 ++++++++++++++++++++++++++++++++++
gdb/testsuite/gdb.dwarf2/inline.exp | 32 ++++++++++++++++++++++++++++++++
3 files changed, 74 insertions(+), 1 deletion(-)
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 3ca441c4cae..a8a87e36ff0 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -12024,7 +12024,14 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
<= PC_BOUNDS_INVALID)
{
attr = dwarf2_attr (die, DW_AT_external, cu);
- if (attr == nullptr || !attr->as_boolean ())
+ bool external_p = attr != nullptr && attr->as_boolean ();
+ attr = dwarf2_attr (die, DW_AT_inline, cu);
+ bool inlined_p
+ = (attr != nullptr
+ && attr->is_nonnegative ()
+ && (attr->as_nonnegative () == DW_INL_inlined
+ || attr->as_nonnegative () == DW_INL_declared_inlined));
+ if (!external_p && !inlined_p)
complaint (_("cannot get low and high bounds "
"for subprogram DIE at %s"),
sect_offset_str (die->sect_off));
diff --git a/gdb/testsuite/gdb.dwarf2/inline.c b/gdb/testsuite/gdb.dwarf2/inline.c
new file mode 100644
index 00000000000..2e07f6c4a9d
--- /dev/null
+++ b/gdb/testsuite/gdb.dwarf2/inline.c
@@ -0,0 +1,34 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+ Copyright 2022 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/>. */
+
+static int __attribute__((always_inline))
+foo (void)
+{
+ return 0;
+}
+
+static int inline __attribute__((always_inline))
+foo2 (void)
+{
+ return 0;
+}
+
+int
+main (void)
+{
+ return foo () + foo2 ();
+}
diff --git a/gdb/testsuite/gdb.dwarf2/inline.exp b/gdb/testsuite/gdb.dwarf2/inline.exp
new file mode 100644
index 00000000000..06182d877af
--- /dev/null
+++ b/gdb/testsuite/gdb.dwarf2/inline.exp
@@ -0,0 +1,32 @@
+# Copyright 2022 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/>.
+
+standard_testfile .c
+
+if [prepare_for_testing "failed to prepare" $testfile $srcfile \
+ {debug nowarnings}] {
+ return -1
+}
+
+set cmd "ptype main"
+
+set re \
+ [multi_line \
+ $cmd \
+ "type = int \\(void\\)"]
+
+with_complaints 5 {
+ gdb_test $cmd $re "$cmd without complaints"
+}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [committed][gdb/symtab] Don't complain about inlined functions
2022-09-09 12:57 [PATCH][gdb/symtab] Don't complain about inlined functions Tom de Vries
@ 2022-10-04 14:52 ` Tom de Vries
0 siblings, 0 replies; 2+ messages in thread
From: Tom de Vries @ 2022-10-04 14:52 UTC (permalink / raw)
To: gdb-patches
On 9/9/22 14:57, Tom de Vries wrote:
> Hi,
>
> With the test-case included in this patch, we get:
> ...
> (gdb) ptype main^M
> During symbol reading: cannot get low and high bounds for subprogram DIE \
> at 0x113^M
> During symbol reading: cannot get low and high bounds for subprogram DIE \
> at 0x11f^M
> type = int (void)^M
> (gdb) FAIL: gdb.dwarf2/inline.exp: ptype main
> ...
>
> The complaints are about foo, with DW_AT_inline == DW_INL_inlined:
> ...
> <1><11f>: Abbrev Number: 6 (DW_TAG_subprogram)
> <120> DW_AT_name : foo
> <126> DW_AT_prototyped : 1
> <126> DW_AT_type : <0x10c>
> <12a> DW_AT_inline : 1 (inlined)
> ...
> and foo2, with DW_AT_inline == DW_INL_declared_inlined:
> ...
> <1><113>: Abbrev Number: 5 (DW_TAG_subprogram)
> <114> DW_AT_name : foo2
> <11a> DW_AT_prototyped : 1
> <11a> DW_AT_type : <0x10c>
> <11e> DW_AT_inline : 3 (declared as inline and inlined)
> ...
>
> Fix this by not complaining about inlined functions.
>
> Tested on x86_64-linux.
>
> Any comments?
>
Committed.
Thanks,
- Tom
> [gdb/symtab] Don't complain about inlined functions
>
> ---
> gdb/dwarf2/read.c | 9 ++++++++-
> gdb/testsuite/gdb.dwarf2/inline.c | 34 ++++++++++++++++++++++++++++++++++
> gdb/testsuite/gdb.dwarf2/inline.exp | 32 ++++++++++++++++++++++++++++++++
> 3 files changed, 74 insertions(+), 1 deletion(-)
>
> diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
> index 3ca441c4cae..a8a87e36ff0 100644
> --- a/gdb/dwarf2/read.c
> +++ b/gdb/dwarf2/read.c
> @@ -12024,7 +12024,14 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
> <= PC_BOUNDS_INVALID)
> {
> attr = dwarf2_attr (die, DW_AT_external, cu);
> - if (attr == nullptr || !attr->as_boolean ())
> + bool external_p = attr != nullptr && attr->as_boolean ();
> + attr = dwarf2_attr (die, DW_AT_inline, cu);
> + bool inlined_p
> + = (attr != nullptr
> + && attr->is_nonnegative ()
> + && (attr->as_nonnegative () == DW_INL_inlined
> + || attr->as_nonnegative () == DW_INL_declared_inlined));
> + if (!external_p && !inlined_p)
> complaint (_("cannot get low and high bounds "
> "for subprogram DIE at %s"),
> sect_offset_str (die->sect_off));
> diff --git a/gdb/testsuite/gdb.dwarf2/inline.c b/gdb/testsuite/gdb.dwarf2/inline.c
> new file mode 100644
> index 00000000000..2e07f6c4a9d
> --- /dev/null
> +++ b/gdb/testsuite/gdb.dwarf2/inline.c
> @@ -0,0 +1,34 @@
> +/* This testcase is part of GDB, the GNU debugger.
> +
> + Copyright 2022 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/>. */
> +
> +static int __attribute__((always_inline))
> +foo (void)
> +{
> + return 0;
> +}
> +
> +static int inline __attribute__((always_inline))
> +foo2 (void)
> +{
> + return 0;
> +}
> +
> +int
> +main (void)
> +{
> + return foo () + foo2 ();
> +}
> diff --git a/gdb/testsuite/gdb.dwarf2/inline.exp b/gdb/testsuite/gdb.dwarf2/inline.exp
> new file mode 100644
> index 00000000000..06182d877af
> --- /dev/null
> +++ b/gdb/testsuite/gdb.dwarf2/inline.exp
> @@ -0,0 +1,32 @@
> +# Copyright 2022 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/>.
> +
> +standard_testfile .c
> +
> +if [prepare_for_testing "failed to prepare" $testfile $srcfile \
> + {debug nowarnings}] {
> + return -1
> +}
> +
> +set cmd "ptype main"
> +
> +set re \
> + [multi_line \
> + $cmd \
> + "type = int \\(void\\)"]
> +
> +with_complaints 5 {
> + gdb_test $cmd $re "$cmd without complaints"
> +}
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-10-04 14:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-09 12:57 [PATCH][gdb/symtab] Don't complain about inlined functions Tom de Vries
2022-10-04 14:52 ` [committed][gdb/symtab] " Tom de Vries
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).