mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-27 03:51:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

[gdb/symtab] Factor out have_complaint

Browse Source 
After committing 8ba677d356 ("[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.
This commit is contained in:
Tom de Vries 2022-10-06 14:53:07 +02:00
parent 80e0c6dc91
commit ca10a126c6
2 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gdb/complaints.h
View File

@ -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 inline 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_complaint ()) \
complaint_internal (FMT, ##__VA_ARGS__); \
} \
while (0)

31
gdb/dwarf2/read.c
View File

@ -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;
}