[gdb/symtab] Factor out have_complaint
Commit Message
Hi,
After committing 8ba677d3560 ("[gdb/symtab] Don't complain about function
decls") I noticed that quite a bit of code in read_func_scope is used to decide
whether to issue the "cannot get low and high bounds for subprogram DIE at
$hex" complaint, which executes unnecessarily if we have the default
"set complaints 0".
Fix this by (NFC):
- factoring out new static function have_complaint from macro complaint, and
- using it to wrap the relevant code in read_func_scope.
Tested on x86_64-linux.
Any comments?
Thanks,
- Tom
[gdb/symtab] Factor out have_complaint
---
gdb/complaints.h | 11 ++++++++++-
gdb/dwarf2/read.c | 31 +++++++++++++++++--------------
2 files changed, 27 insertions(+), 15 deletions(-)
Comments
On 10/4/22 17:10, Tom de Vries via Gdb-patches wrote:
> Hi,
>
> After committing 8ba677d3560 ("[gdb/symtab] Don't complain about function
> decls") I noticed that quite a bit of code in read_func_scope is used to decide
> whether to issue the "cannot get low and high bounds for subprogram DIE at
> $hex" complaint, which executes unnecessarily if we have the default
> "set complaints 0".
>
> Fix this by (NFC):
> - factoring out new static function have_complaint from macro complaint, and
> - using it to wrap the relevant code in read_func_scope.
>
> Tested on x86_64-linux.
>
> Any comments?
>
Well, I didn't check properly, this doesn't even build, I'll repost once
I got a properly build & tested version.
Sorry for the noise.
Thanks,
- Tom
On 10/4/22 17:51, Tom de Vries wrote:
> On 10/4/22 17:10, Tom de Vries via Gdb-patches wrote:
>> Hi,
>>
>> After committing 8ba677d3560 ("[gdb/symtab] Don't complain about function
>> decls") I noticed that quite a bit of code in read_func_scope is used
>> to decide
>> whether to issue the "cannot get low and high bounds for subprogram
>> DIE at
>> $hex" complaint, which executes unnecessarily if we have the default
>> "set complaints 0".
>>
>> Fix this by (NFC):
>> - factoring out new static function have_complaint from macro
>> complaint, and
>> - using it to wrap the relevant code in read_func_scope.
>>
>> Tested on x86_64-linux.
>>
>> Any comments?
>>
>
> Well, I didn't check properly, this doesn't even build, I'll repost once
> I got a properly build & tested version.
And here it is.
Thanks,
- Tom
On 04/10/2022 18:43, Tom de Vries via Gdb-patches wrote:
> On 10/4/22 17:51, Tom de Vries wrote:
>> On 10/4/22 17:10, Tom de Vries via Gdb-patches wrote:
>>> Hi,
>>>
>>> After committing 8ba677d3560 ("[gdb/symtab] Don't complain about
>>> function
>>> decls") I noticed that quite a bit of code in read_func_scope is
>>> used to decide
>>> whether to issue the "cannot get low and high bounds for subprogram
>>> DIE at
>>> $hex" complaint, which executes unnecessarily if we have the default
>>> "set complaints 0".
>>>
>>> Fix this by (NFC):
>>> - factoring out new static function have_complaint from macro
>>> complaint, and
>>> - using it to wrap the relevant code in read_func_scope.
>>>
>>> Tested on x86_64-linux.
>>>
>>> Any comments?
>>>
>>
>> Well, I didn't check properly, this doesn't even build, I'll repost
>> once I got a properly build & tested version.
>
> And here it is.
I tested this locally and it introduces no regressions. And the changes
themselves look contained enough, so I recommend you approve your patch!
Cheers,
Bruno
>
> Thanks,
> - Tom
@@ -31,6 +31,15 @@ extern void complaint_internal (const char *fmt, ...)
extern int stop_whining;
+/* Return true if complaints are enabled. This can be used to guard code
+ that is used only to decide whether to issue a complaint. */
+
+static bool
+have_complaint ()
+{
+ return stop_whining > 0;
+}
+
/* Register a complaint. This is a macro around complaint_internal to
avoid computing complaint's arguments when complaints are disabled.
Running FMT via gettext [i.e., _(FMT)] can be quite expensive, for
@@ -38,7 +47,7 @@ extern int stop_whining;
#define complaint(FMT, ...) \
do \
{ \
- if (stop_whining > 0) \
+ if (have_complaints ()) \
complaint_internal (FMT, ##__VA_ARGS__); \
} \
while (0)
@@ -12043,20 +12043,23 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
if (dwarf2_get_pc_bounds (die, &lowpc, &highpc, cu, nullptr, nullptr)
<= PC_BOUNDS_INVALID)
{
- attr = dwarf2_attr (die, DW_AT_external, cu);
- 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));
- attr = dwarf2_attr (die, DW_AT_declaration, cu);
- bool decl_p = attr != nullptr && attr->as_boolean ();
- if (!external_p && !inlined_p && !decl_p)
- complaint (_("cannot get low and high bounds "
- "for subprogram DIE at %s"),
- sect_offset_str (die->sect_off));
+ if (have_complaint ())
+ {
+ attr = dwarf2_attr (die, DW_AT_external, cu);
+ 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));
+ attr = dwarf2_attr (die, DW_AT_declaration, cu);
+ bool decl_p = attr != nullptr && attr->as_boolean ();
+ if (!external_p && !inlined_p && !decl_p)
+ complaint (_("cannot get low and high bounds "
+ "for subprogram DIE at %s"),
+ sect_offset_str (die->sect_off));
+ }
return;
}