From f34652de0b68c4ee3050828b43a2839b852b5821 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Mon, 17 Oct 2022 17:12:20 +0100 Subject: 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 Change-Id: Ia6f372c11550ca876829e8fd85048f4502bdcf06 --- gdb/frame.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gdb/frame.c') diff --git a/gdb/frame.c b/gdb/frame.c index e08b9c90065..3ddc0d06996 100644 --- a/gdb/frame.c +++ b/gdb/frame.c @@ -988,8 +988,7 @@ frame_unwind_pc (frame_info_ptr this_frame) else if (this_frame->prev_pc.status == CC_NOT_SAVED) throw_error (OPTIMIZED_OUT_ERROR, _("PC not saved")); else - internal_error (__FILE__, __LINE__, - "unexpected prev_pc status: %d", + internal_error ("unexpected prev_pc status: %d", (int) this_frame->prev_pc.status); } @@ -3008,8 +3007,7 @@ unwind_stop_reason_to_string (enum unwind_stop_reason reason) #undef SET default: - internal_error (__FILE__, __LINE__, - "Invalid frame stop reason"); + internal_error ("Invalid frame stop reason"); } } @@ -3041,8 +3039,7 @@ frame_stop_reason_symbol_string (enum unwind_stop_reason reason) #undef SET default: - internal_error (__FILE__, __LINE__, - "Invalid frame stop reason"); + internal_error ("Invalid frame stop reason"); } } -- cgit v1.2.1