diff options
| author | Pedro Alves <pedro@palves.net> | 2022-10-17 17:12:20 +0100 |
|---|---|---|
| committer | Pedro Alves <pedro@palves.net> | 2022-10-19 15:32:36 +0100 |
| commit | f34652de0b68c4ee3050828b43a2839b852b5821 (patch) | |
| tree | 851720f14f2ac022c3e82428254edf161d619e91 /gdb/stap-probe.c | |
| parent | 5c831a3c7f3ca98d6aba1200353311e1a1f84c70 (diff) | |
| download | fsf-binutils-gdb-f34652de0b68c4ee3050828b43a2839b852b5821.zip fsf-binutils-gdb-f34652de0b68c4ee3050828b43a2839b852b5821.tar.gz fsf-binutils-gdb-f34652de0b68c4ee3050828b43a2839b852b5821.tar.bz2 | |
internal_error: remove need to pass __FILE__/__LINE__
Currently, every internal_error call must be passed __FILE__/__LINE__
explicitly, like:
internal_error (__FILE__, __LINE__, "foo %d", var);
The need to pass in explicit __FILE__/__LINE__ is there probably
because the function predates widespread and portable variadic macros
availability. We can use variadic macros nowadays, and in fact, we
already use them in several places, including the related
gdb_assert_not_reached.
So this patch renames the internal_error function to something else,
and then reimplements internal_error as a variadic macro that expands
__FILE__/__LINE__ itself.
The result is that we now should call internal_error like so:
internal_error ("foo %d", var);
Likewise for internal_warning.
The patch adjusts all calls sites. 99% of the adjustments were done
with a perl/sed script.
The non-mechanical changes are in gdbsupport/errors.h,
gdbsupport/gdb_assert.h, and gdb/gdbarch.py.
Approved-By: Simon Marchi <simon.marchi@efficios.com>
Change-Id: Ia6f372c11550ca876829e8fd85048f4502bdcf06
Diffstat (limited to 'gdb/stap-probe.c')
| -rw-r--r-- | gdb/stap-probe.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gdb/stap-probe.c b/gdb/stap-probe.c index e3a97c0..7e3d26b 100644 --- a/gdb/stap-probe.c +++ b/gdb/stap-probe.c @@ -185,15 +185,13 @@ public: gdb_assert (m_have_parsed_args); if (m_parsed_args.empty ()) - internal_error (__FILE__, __LINE__, - _("Probe '%s' apparently does not have arguments, but \n" + internal_error (_("Probe '%s' apparently does not have arguments, but \n" "GDB is requesting its argument number %u anyway. " "This should not happen. Please report this bug."), this->get_name ().c_str (), n); if (n > m_parsed_args.size ()) - internal_error (__FILE__, __LINE__, - _("Probe '%s' has %d arguments, but GDB is requesting\n" + internal_error (_("Probe '%s' has %d arguments, but GDB is requesting\n" "argument %u. This should not happen. Please\n" "report this bug."), this->get_name ().c_str (), @@ -811,8 +809,7 @@ stap_parse_register_operand (struct stap_parse_info *p) newregname.size ()); if (regnum == -1) - internal_error (__FILE__, __LINE__, - _("Invalid register name '%s' after replacing it" + internal_error (_("Invalid register name '%s' after replacing it" " (previous name was '%s')"), newregname.c_str (), regname.c_str ()); |